diff options
| author | Dan Albert <danalbert@google.com> | 2017-03-14 15:12:59 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2017-03-14 15:12:59 -0700 |
| commit | b9e7f084bdb262592ef617346fec3efeeadc12d9 (patch) | |
| tree | 98be0728c8a7e96003719c4145662f487a663d81 /test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp | |
| parent | cebe3685c0b367477d3f708c3fb0a278ab645c06 (diff) | |
| parent | 0b23f9c81d7d86cd023d5b43292e22bff76443e6 (diff) | |
| download | external_libcxx-b9e7f084bdb262592ef617346fec3efeeadc12d9.tar.gz external_libcxx-b9e7f084bdb262592ef617346fec3efeeadc12d9.tar.bz2 external_libcxx-b9e7f084bdb262592ef617346fec3efeeadc12d9.zip | |
Merge to upstream r297772.
Bug: None
Test: make checkbuild && ./run_tests.py
Change-Id: I9e755c76a760f218abd871008e3d48c8f044afd1
Diffstat (limited to 'test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp')
| -rw-r--r-- | test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp b/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp index 0ec1f8056..57f09d7ce 100644 --- a/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp +++ b/test/std/containers/sequences/forwardlist/forwardlist.cons/default_noexcept.pass.cpp @@ -32,14 +32,16 @@ struct some_alloc int main() { +#if defined(_LIBCPP_VERSION) { typedef std::forward_list<MoveOnly> C; - LIBCPP_STATIC_ASSERT(std::is_nothrow_default_constructible<C>::value, ""); + static_assert(std::is_nothrow_default_constructible<C>::value, ""); } { typedef std::forward_list<MoveOnly, test_allocator<MoveOnly>> C; - LIBCPP_STATIC_ASSERT(std::is_nothrow_default_constructible<C>::value, ""); + static_assert(std::is_nothrow_default_constructible<C>::value, ""); } +#endif // _LIBCPP_VERSION { typedef std::forward_list<MoveOnly, other_allocator<MoveOnly>> C; static_assert(!std::is_nothrow_default_constructible<C>::value, ""); |