merge tmj

2026-07-22 00:09:18 +02:00 · 2017-02-14 19:26:51 +01:00
parent 92f39cd9b9 b0ed27ba91
commit 21bb3bc0e7
25 changed files with 1053 additions and 1179 deletions
--- a/stdafx.h
+++ b/stdafx.h
@@ -53,6 +53,7 @@
 #include <limits>
 #include <memory>
 #include <thread>
+#include <atomic>
 #include <mutex>
 #include <condition_variable>
 #include <typeinfo>