Merge pull request #44 from dpryan79/master

Updates for TBB oneapi and C++11
medvedevgroup · Sep 29, 2022 · 602b82c · 602b82c
2 parents d1f9009 + 3ba9a11
commit 602b82c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/SibeliaZ-LCB/common/streamfastaparser.h b/SibeliaZ-LCB/common/streamfastaparser.h
@@ -5,9 +5,9 @@
 #include <fstream>
 #include <stdexcept>
 #include <algorithm>
-#include <tbb/mutex.h>
 #include <iostream>
 #include <memory>
+#include <mutex>
 
 #include "dnachar.h"
 
@@ -131,7 +131,7 @@ namespace TwoPaCo
 		size_t seqId_;
 		size_t start_;
 		size_t pieceId_;
-		tbb::mutex mutex_;
+		std::mutex mutex_;
 		size_t overlapSize_;
 		std::ifstream in_;
 		std::string overlapBuffer_;

diff --git a/SibeliaZ-LCB/distancekeeper.h b/SibeliaZ-LCB/distancekeeper.h
@@ -2,6 +2,7 @@
 #define _DISTANCE_KEEPER_H_
 
 #include "junctionstorage.h"
+#include <climits>
 
 namespace Sibelia
 {