Merge branch 'release/0.32.1'

flax-lang · Dec 8, 2018 · 67def52 · 67def52
2 parents b545e4e + 98166bb
commit 67def52
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/source/include/defs.h b/source/include/defs.h
@@ -88,6 +88,11 @@ std::string strprintf(const char* fmt, Ts... ts)
 
 #define dcast(t, v)		dynamic_cast<t*>(v)
 
+#define USE_SKA_HASHMAP false
+#if USE_SKA_HASHMAP
+	#include "ska/flat_hash_map.hpp"
+#endif
+
 namespace util
 {
 	#ifndef STRING_VIEW_TYPE
@@ -105,7 +110,6 @@ namespace util
 	#endif
 
 
-	#define USE_SKA_HASHMAP false
 
 	#if USE_SKA_HASHMAP
 		using hash_map = ska::flat_hash_map;

diff --git a/source/include/precompile.h b/source/include/precompile.h
@@ -23,8 +23,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "ska/flat_hash_map.hpp"
-
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,8 +23,6 @@ @@
     #include <unordered_map>
     #include <unordered_set>
-    #include "ska/flat_hash_map.hpp"
     #endif
@@ Expand Down @@