Remove unused left overs from the mutex

dib-lab · Feb 1, 2017 · a870206 · a870206
1 parent 28d41a3
commit a870206
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/lib/khmer.hh b/lib/khmer.hh
@@ -122,7 +122,7 @@ typedef unsigned short int BoundedCounterType;
 
 // A single-byte type.
 typedef unsigned char Byte;
-typedef std::atomic<uint8_t> AtomicByte;
+using AtomicByte = std::atomic<uint8_t>;
 
 
 typedef void (*CallbackFn)(const char * info, void * callback_data,

diff --git a/lib/storage.hh b/lib/storage.hh
@@ -38,10 +38,6 @@ Contact: [email protected]
 #ifndef STORAGE_HH
 #define STORAGE_HH
 
-#include <cassert>
-#include <array>
-#include <mutex>
-using MuxGuard = std::lock_guard<std::mutex>;
 
 namespace khmer
 {
@@ -262,8 +258,6 @@ public:
     NibbleStorage(std::vector<uint64_t>& tablesizes) :
         _tablesizes{tablesizes}, _occupied_bins{0}, _n_unique_kmers{0}
     {
-        // to allow more than 32 tables increase the size of mutex pool
-        assert(_n_tables <= 32);
         _allocate_counters();
     }