summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-12-02 21:32:35 +0000
committerEric Fiselier <eric@efcs.ca>2016-12-02 21:32:35 +0000
commitffd5732170f012e7ed3ad464ecd972437a0990f9 (patch)
tree16e2ac6ccec42c776383538a9c1988eaa7d159f4 /libcxx/test/std
parent3eb98a13183703c36cc481189e1b362d7077a9b4 (diff)
downloadbcm5719-llvm-ffd5732170f012e7ed3ad464ecd972437a0990f9.tar.gz
bcm5719-llvm-ffd5732170f012e7ed3ad464ecd972437a0990f9.zip
Fix copy/paste errors in new variant tests
llvm-svn: 288538
Diffstat (limited to 'libcxx/test/std')
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp6
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
index 95d5af9d276..65c2052fdfe 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
@@ -387,16 +387,16 @@ void test_copy_assignment_different_index() {
template <size_t NewIdx, class ValueType>
constexpr bool test_constexpr_assign_extension_imp(
- std::variant<long, void*, const int>&& v, ValueType&& new_value)
+ std::variant<long, void*, int>&& v, ValueType&& new_value)
{
- const std::variant<long, void*, const int> cp(
+ const std::variant<long, void*, int> cp(
std::forward<ValueType>(new_value));
v = cp;
return v.index() == NewIdx &&
std::get<NewIdx>(v) == std::get<NewIdx>(cp);
}
-void test_constexpr_move_ctor_extension() {
+void test_constexpr_copy_assignment_extension() {
#ifdef _LIBCPP_VERSION
using V = std::variant<long, void*, int>;
static_assert(std::is_trivially_copyable<V>::value, "");
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
index d10bd2d4956..0e07d13e9e9 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
@@ -310,9 +310,9 @@ void test_move_assignment_different_index() {
template <size_t NewIdx, class ValueType>
constexpr bool test_constexpr_assign_extension_imp(
- std::variant<long, void*, const int>&& v, ValueType&& new_value)
+ std::variant<long, void*, int>&& v, ValueType&& new_value)
{
- std::variant<long, void*, const int> v2(
+ std::variant<long, void*, int> v2(
std::forward<ValueType>(new_value));
const auto cp = v2;
v = std::move(v2);
@@ -320,7 +320,7 @@ constexpr bool test_constexpr_assign_extension_imp(
std::get<NewIdx>(v) == std::get<NewIdx>(cp);
}
-void test_constexpr_move_ctor_extension() {
+void test_constexpr_move_assignment_extension() {
#ifdef _LIBCPP_VERSION
using V = std::variant<long, void*, int>;
static_assert(std::is_trivially_copyable<V>::value, "");
OpenPOWER on IntegriCloud