mirror of
https://github.com/greg7mdp/parallel-hashmap.git
synced 2026-08-29 08:34:39 +08:00
Merge pull request #193 from barracuda156/darwin
Fixes for macOS and 32-bit
This commit is contained in:
Vendored
+2
-2
@@ -100,7 +100,7 @@
|
||||
#endif
|
||||
|
||||
#if CHAR_BIT != 8
|
||||
#error "phmap assumes CHAR_BIT == 8."
|
||||
#warning "phmap assumes CHAR_BIT == 8."
|
||||
#endif
|
||||
|
||||
// phmap currently assumes that an int is 4 bytes.
|
||||
@@ -154,7 +154,7 @@
|
||||
// -------------------------------------------------------------------
|
||||
#ifdef PHMAP_HAVE_THREAD_LOCAL
|
||||
#error PHMAP_HAVE_THREAD_LOCAL cannot be directly set
|
||||
#elif defined(__APPLE__)
|
||||
#elif defined(__APPLE__) && defined(__clang__)
|
||||
#if __has_feature(cxx_thread_local) && \
|
||||
!(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0)
|
||||
#define PHMAP_HAVE_THREAD_LOCAL 1
|
||||
|
||||
Reference in New Issue
Block a user