diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2019-09-25 09:10:38 +0000 |
|---|---|---|
| committer | Ilya Biryukov <ibiryukov@google.com> | 2019-09-25 09:10:38 +0000 |
| commit | a3d337a9a7d00d82bb190c5e551181d3998f6b98 (patch) | |
| tree | 24894b738fba0f734957c9af632f5bc1f584276f /libcxx/src | |
| parent | 436d9881a9a87b2c4177831435e85c8f47ce9ab1 (diff) | |
| download | bcm5719-llvm-a3d337a9a7d00d82bb190c5e551181d3998f6b98.tar.gz bcm5719-llvm-a3d337a9a7d00d82bb190c5e551181d3998f6b98.zip | |
Revert r372777: [libc++] Implement LWG 2510 and its follow-ups
This also reverts:
- r372778: [libc++] Implement LWG 3158
- r372782: [libc++] Try fixing tests that fail on GCC 5 and older
- r372787: Purge mentions of GCC 4 from the test suite
Reason: the change breaks compilation of LLVM with libc++, for details see
http://lists.llvm.org/pipermail/libcxx-dev/2019-September/000599.html
llvm-svn: 372832
Diffstat (limited to 'libcxx/src')
| -rw-r--r-- | libcxx/src/mutex.cpp | 6 | ||||
| -rw-r--r-- | libcxx/src/utility.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/src/mutex.cpp b/libcxx/src/mutex.cpp index 7e979cd8904..182785733ef 100644 --- a/libcxx/src/mutex.cpp +++ b/libcxx/src/mutex.cpp @@ -21,9 +21,9 @@ _LIBCPP_BEGIN_NAMESPACE_STD #ifndef _LIBCPP_HAS_NO_THREADS -const defer_lock_t defer_lock{}; -const try_to_lock_t try_to_lock{}; -const adopt_lock_t adopt_lock{}; +const defer_lock_t defer_lock = {}; +const try_to_lock_t try_to_lock = {}; +const adopt_lock_t adopt_lock = {}; // ~mutex is defined elsewhere diff --git a/libcxx/src/utility.cpp b/libcxx/src/utility.cpp index 6a690dc2879..016a5d91b85 100644 --- a/libcxx/src/utility.cpp +++ b/libcxx/src/utility.cpp @@ -10,6 +10,6 @@ _LIBCPP_BEGIN_NAMESPACE_STD -const piecewise_construct_t piecewise_construct{}; +const piecewise_construct_t piecewise_construct = {}; _LIBCPP_END_NAMESPACE_STD |
