diff options
| author | Dan Albert <danalbert@google.com> | 2017-03-20 18:55:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-20 18:55:32 +0000 |
| commit | 484d8fb3291dd4d29c3d9ef6634cb9fdceb08595 (patch) | |
| tree | 98be0728c8a7e96003719c4145662f487a663d81 /test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp | |
| parent | 43580c8f896fc0a272d6a45b280d6f08fb7c7719 (diff) | |
| parent | ed31f4b9be19ad4eaff38d16fe13a5f8e8da2c45 (diff) | |
| download | external_libcxx-484d8fb3291dd4d29c3d9ef6634cb9fdceb08595.tar.gz external_libcxx-484d8fb3291dd4d29c3d9ef6634cb9fdceb08595.tar.bz2 external_libcxx-484d8fb3291dd4d29c3d9ef6634cb9fdceb08595.zip | |
Merge to upstream r297772. am: b9e7f084bd am: fabe890b75
am: ed31f4b9be
Change-Id: Ieb19cbc938b9511d6441b9ac7cf6a3e13c4daf74
Diffstat (limited to 'test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp')
| -rw-r--r-- | test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp b/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp index bae97cf4e..18d64bc5f 100644 --- a/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp +++ b/test/std/containers/associative/multiset/multiset.cons/move_assign_noexcept.pass.cpp @@ -44,10 +44,12 @@ int main() typedef std::multiset<MoveOnly, std::less<MoveOnly>, test_allocator<MoveOnly>> C; static_assert(!std::is_nothrow_move_assignable<C>::value, ""); } +#if defined(_LIBCPP_VERSION) { typedef std::multiset<MoveOnly, std::less<MoveOnly>, other_allocator<MoveOnly>> C; - LIBCPP_STATIC_ASSERT(std::is_nothrow_move_assignable<C>::value, ""); + static_assert(std::is_nothrow_move_assignable<C>::value, ""); } +#endif // _LIBCPP_VERSION { typedef std::multiset<MoveOnly, some_comp<MoveOnly>> C; static_assert(!std::is_nothrow_move_assignable<C>::value, ""); |