diff options
| author | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-11-07 16:08:02 +0700 |
|---|---|---|
| committer | Bruce Mitchener <bruce.mitchener@gmail.com> | 2013-11-07 16:08:02 +0700 |
| commit | 8a8f0348a15b274ab2fc1f98a434fe8c7e02ff82 (patch) | |
| tree | c171a40cc7610b0f621be5365acc108162f4ae44 /system | |
| parent | 44af976a44bc194b985fdb880f99a7feff133b5a (diff) | |
Don't use atomic as that breaks our version of clang.
Diffstat (limited to 'system')
| -rw-r--r-- | system/include/libcxx/ios | 2 | ||||
| -rw-r--r-- | system/lib/libcxx/ios.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/system/include/libcxx/ios b/system/include/libcxx/ios index d95f18a5..b6cf0766 100644 --- a/system/include/libcxx/ios +++ b/system/include/libcxx/ios @@ -367,7 +367,7 @@ private: int* __index_; size_t __event_size_; size_t __event_cap_; -#if __has_feature(cxx_atomic) +#if __has_feature(cxx_atomic) && !defined(__EMSCRIPTEN__) static atomic<int> __xindex_; #else static int __xindex_; diff --git a/system/lib/libcxx/ios.cpp b/system/lib/libcxx/ios.cpp index bbe3c072..004d3183 100644 --- a/system/lib/libcxx/ios.cpp +++ b/system/lib/libcxx/ios.cpp @@ -149,7 +149,7 @@ ios_base::getloc() const } // xalloc -#if __has_feature(cxx_atomic) +#if __has_feature(cxx_atomic) && !defined(__EMSCRIPTEN__) atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0); #else int ios_base::__xindex_ = 0; |