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
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);
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)
diff --git a/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp b/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
index d0a9648..b94588e 100644
--- a/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
+++ b/test/std/containers/sequences/vector.bool/default_noexcept.pass.cpp
@@ -39,21 +39,11 @@
}
{
typedef std::vector<bool, other_allocator<bool>> C;
-// See N4258 - vector<T, Allocator>::basic_string() noexcept;
-#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
-#else
- static_assert( std::is_nothrow_default_constructible<C>::value, "");
-#endif
}
{
typedef std::vector<bool, some_alloc<bool>> C;
-// See N4258 - vector<T, Allocator>::basic_string() noexcept;
-#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
-#else
- static_assert( std::is_nothrow_default_constructible<C>::value, "");
-#endif
}
#endif
}
diff --git a/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp b/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
index 9d757bf..5e87c07 100644
--- a/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.cons/construct_default.pass.cpp
@@ -15,6 +15,7 @@
#include <vector>
#include <cassert>
+#include "test_macros.h"
#include "test_allocator.h"
#include "../../../NotConstructible.h"
#include "../../../stack_allocator.h"
diff --git a/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp b/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
index e13a5fc..60f7b72 100644
--- a/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
+++ b/test/std/containers/sequences/vector/vector.cons/default_noexcept.pass.cpp
@@ -41,21 +41,11 @@
}
{
typedef std::vector<MoveOnly, other_allocator<MoveOnly>> C;
-// See N4258 - vector<T, Allocator>::basic_string() noexcept;
-#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
-#else
- static_assert( std::is_nothrow_default_constructible<C>::value, "");
-#endif
}
{
typedef std::vector<MoveOnly, some_alloc<MoveOnly>> C;
-// See N4258 - vector<T, Allocator>::basic_string() noexcept;
-#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
-#else
- static_assert( std::is_nothrow_default_constructible<C>::value, "");
-#endif
}
#endif
}
diff --git a/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp b/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp
index c6137d6..af11710 100644
--- a/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp
+++ b/test/std/strings/basic.string/string.cons/default_noexcept.pass.cpp
@@ -40,12 +40,7 @@
}
{
typedef std::basic_string<char, std::char_traits<char>, some_alloc<char>> C;
-// See N4258 - basic_string<char, traits, Allocator>::basic_string() noexcept;
-#if TEST_STD_VER <= 14
static_assert(!std::is_nothrow_default_constructible<C>::value, "");
-#else
- static_assert( std::is_nothrow_default_constructible<C>::value, "");
-#endif
}
#endif
}