Skip to content

Commit 67def52

Browse files
committed
Merge branch 'release/0.32.1'
2 parents b545e4e + 98166bb commit 67def52

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

source/include/defs.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ std::string strprintf(const char* fmt, Ts... ts)
8888

8989
#define dcast(t, v) dynamic_cast<t*>(v)
9090

91+
#define USE_SKA_HASHMAP false
92+
#if USE_SKA_HASHMAP
93+
#include "ska/flat_hash_map.hpp"
94+
#endif
95+
9196
namespace util
9297
{
9398
#ifndef STRING_VIEW_TYPE
@@ -105,7 +110,6 @@ namespace util
105110
#endif
106111

107112

108-
#define USE_SKA_HASHMAP false
109113

110114
#if USE_SKA_HASHMAP
111115
using hash_map = ska::flat_hash_map;

source/include/precompile.h

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
#include <unordered_map>
2424
#include <unordered_set>
2525

26-
#include "ska/flat_hash_map.hpp"
27-
2826
#endif
2927

3028

0 commit comments

Comments
 (0)