Merge branch 'master' of https://github.com/bbuchfink/diamond

bbuchfink · Feb 27, 2023 · 3511b09 · 3511b09
2 parents d481950 + 109d70c
commit 3511b09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/lib/MemoryPool/MemoryPool.tcc b/src/lib/MemoryPool/MemoryPool.tcc
@@ -23,7 +23,7 @@
 #ifndef MEMORY_BLOCK_TCC
 #define MEMORY_BLOCK_TCC
 
-
+#include <cstdint>
 
 template <typename T, size_t BlockSize>
 inline typename MemoryPool<T, BlockSize>::size_type

diff --git a/src/util/log_stream.h b/src/util/log_stream.h
@@ -79,7 +79,7 @@ struct task_timer
 	{}
 	~task_timer()
 	{
-		if (!std::uncaught_exception())
+		if (!std::uncaught_exceptions())
 			finish();
 	}
 	void go(const char* msg = nullptr)
@@ -144,4 +144,4 @@ struct task_timer
 	std::chrono::high_resolution_clock::time_point t;
 };
 
-void exit_with_error(const std::exception& e);
+void exit_with_error(const std::exception& e);