commit e546cbba06b44e5495dc13e13f824566b258ecd1
author Marshall Clow <mclow.lists@gmail.com> Thu Jun 04 02:05:41 2015 +0000
committer Marshall Clow <mclow.lists@gmail.com> Thu Jun 04 02:05:41 2015 +0000
tree ad7578fb60944a6bbff41ae42c51b8c6d2e7cb50
parent 8f282f4cb7a21baad294f121057d33b54628bd41

While applying N4258, I forgot about LWG#2455, which modified the modifications. Correct those - h/t: Howard

llvm-svn: 239004
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 979550f2210e5c5fb1c061f5b88cdcbd6fa40f36

include/string

diff --git a/include/string b/include/string
index b8cbea3..ac7b30a 100644
--- a/include/string
+++ b/include/string
@@ -1321,11 +1321,7 @@
     static const size_type npos = -1;
 
     _LIBCPP_INLINE_VISIBILITY basic_string()
-#if _LIBCPP_STD_VER <= 14
         _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-#else
-        _NOEXCEPT;
-#endif
 
     _LIBCPP_INLINE_VISIBILITY explicit basic_string(const allocator_type& __a)
 #if _LIBCPP_STD_VER <= 14
@@ -1943,11 +1939,7 @@
 template <class _CharT, class _Traits, class _Allocator>
 inline _LIBCPP_INLINE_VISIBILITY
 basic_string<_CharT, _Traits, _Allocator>::basic_string()
-#if _LIBCPP_STD_VER <= 14
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-#else
-        _NOEXCEPT
-#endif
+    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
 {
 #if _LIBCPP_DEBUG_LEVEL >= 2
     __get_db()->__insert_c(this);

include/vector

diff --git a/include/vector b/include/vector
index ec413fa..3600147 100644
--- a/include/vector
+++ b/include/vector
@@ -500,12 +500,7 @@
                   "Allocator::value_type must be same type as value_type");
 
     _LIBCPP_INLINE_VISIBILITY
-    vector()
-#if _LIBCPP_STD_VER <= 14
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-#else
-        _NOEXCEPT
-#endif
+    vector() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
         {
 #if _LIBCPP_DEBUG_LEVEL >= 2
             __get_db()->__insert_c(this);
@@ -2170,12 +2165,7 @@
 
 public:
     _LIBCPP_INLINE_VISIBILITY
-    vector()
-#if _LIBCPP_STD_VER <= 14
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
-#else
-        _NOEXCEPT;
-#endif
+    vector() _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value);
 
     _LIBCPP_INLINE_VISIBILITY explicit vector(const allocator_type& __a)
 #if _LIBCPP_STD_VER <= 14
@@ -2569,11 +2559,7 @@
 template <class _Allocator>
 inline _LIBCPP_INLINE_VISIBILITY
 vector<bool, _Allocator>::vector()
-#if _LIBCPP_STD_VER <= 14
-        _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
-#else
-        _NOEXCEPT
-#endif
+    _NOEXCEPT_(is_nothrow_default_constructible<allocator_type>::value)
     : __begin_(nullptr),
       __size_(0),
       __cap_alloc_(0)