diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:56:02 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:56:02 -0800 |
| commit | e0268fa1035a718341c53921eee9318d4a8033cd (patch) | |
| tree | 2b3eeb07928f9521498332002444dbfa44f34dfb /system/lib/libcxx/ios.cpp | |
| parent | a11272805c16be75f5e6d00c8214afcac7ba9d05 (diff) | |
| parent | ad1da1e6685d4483e096d7e0bbd8e38e686bd322 (diff) | |
Merge pull request #1767 from waywardmonkeys/update-libcxx1.7.2
Update libcxx
Diffstat (limited to 'system/lib/libcxx/ios.cpp')
| -rw-r--r-- | system/lib/libcxx/ios.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/system/lib/libcxx/ios.cpp b/system/lib/libcxx/ios.cpp index 732a61bb..004d3183 100644 --- a/system/lib/libcxx/ios.cpp +++ b/system/lib/libcxx/ios.cpp @@ -7,6 +7,8 @@ // //===----------------------------------------------------------------------===// +#define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__; + #include "ios" #include "streambuf" #include "istream" @@ -61,7 +63,7 @@ __iostream_category::message(int ev) const } const error_category& -iostream_category() +iostream_category() _NOEXCEPT { static __iostream_category s; return s; @@ -147,8 +149,11 @@ ios_base::getloc() const } // xalloc - +#if __has_feature(cxx_atomic) && !defined(__EMSCRIPTEN__) +atomic<int> ios_base::__xindex_ = ATOMIC_VAR_INIT(0); +#else int ios_base::__xindex_ = 0; +#endif int ios_base::xalloc() |