summaryrefslogtreecommitdiffstats
path: root/libcxx/test/support/variant_test_helpers.hpp
diff options
context:
space:
mode:
authorCasey Carter <Casey@Carter.net>2017-06-07 00:06:04 +0000
committerCasey Carter <Casey@Carter.net>2017-06-07 00:06:04 +0000
commit708a21bd5faecb88a234b2bd6b598e4ec8a093b4 (patch)
tree53a9e7123602aacf08db887044cc264f00027941 /libcxx/test/support/variant_test_helpers.hpp
parent1bfb9f47af8b80d81c48eec71ee3865e3f1b2a68 (diff)
downloadbcm5719-llvm-708a21bd5faecb88a234b2bd6b598e4ec8a093b4.tar.gz
bcm5719-llvm-708a21bd5faecb88a234b2bd6b598e4ec8a093b4.zip
[test] Test changes to accommodate LWG 2904 "Make variant move-assignment more exception safe"
Also: Move constexpr / triviality extension tests into the std tree and make them conditional on _LIBCPP_VERSION / _MSVC_STL_VERSION. https://reviews.llvm.org/D32671 llvm-svn: 304847
Diffstat (limited to 'libcxx/test/support/variant_test_helpers.hpp')
-rw-r--r--libcxx/test/support/variant_test_helpers.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/support/variant_test_helpers.hpp b/libcxx/test/support/variant_test_helpers.hpp
index 27716723371..75981546467 100644
--- a/libcxx/test/support/variant_test_helpers.hpp
+++ b/libcxx/test/support/variant_test_helpers.hpp
@@ -69,9 +69,9 @@ template <class Variant>
void makeEmpty(Variant& v) {
Variant v2(std::in_place_type<MakeEmptyT>);
try {
- v = v2;
+ v = std::move(v2);
assert(false);
- } catch (...) {
+ } catch (...) {
assert(v.valueless_by_exception());
}
}
OpenPOWER on IntegriCloud