summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorCasey Carter <Casey@Carter.net>2019-10-14 14:38:12 +0000
committerCasey Carter <Casey@Carter.net>2019-10-14 14:38:12 +0000
commita4f07b4d2e8d3523cd6454cf8a9410c0cfca0410 (patch)
tree32b66e6791c77f5daada2381aa8918f485e3a73f /libcxx
parenta5ef3daf1d776384eff624725dfc1738e02ad018 (diff)
downloadbcm5719-llvm-a4f07b4d2e8d3523cd6454cf8a9410c0cfca0410.tar.gz
bcm5719-llvm-a4f07b4d2e8d3523cd6454cf8a9410c0cfca0410.zip
[libc++][test] Silence more warnings in variant tests
More cases of signed-to-unsigned conversion warnings that missed the train for d2623522. llvm-svn: 374778
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp2
-rw-r--r--libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp2
4 files changed, 4 insertions, 4 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 07ca63f2363..489dd5dad49 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
@@ -547,7 +547,7 @@ void test_copy_assignment_different_index() {
struct {
constexpr Result<int> operator()() const {
using V = std::variant<int, TCopyAssign, unsigned>;
- V v(std::in_place_type<unsigned>, 43);
+ V v(std::in_place_type<unsigned>, 43u);
V v2(std::in_place_type<TCopyAssign>, 42);
v = v2;
return {v.index(), std::get<1>(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 b70f7aa6bf3..daa5512789c 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
@@ -407,7 +407,7 @@ void test_move_assignment_different_index() {
}
{
using V = std::variant<int, MoveAssign, unsigned>;
- V v1(std::in_place_type<unsigned>, 43);
+ V v1(std::in_place_type<unsigned>, 43u);
V v2(std::in_place_type<MoveAssign>, 42);
MoveAssign::reset();
V &vref = (v1 = std::move(v2));
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
index b09e35762a2..47823b32e7f 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
@@ -111,7 +111,7 @@ void test_basic() {
assert(std::get<2>(v) == &x);
assert(&ref2 == &std::get<2>(v));
// emplace with multiple args
- auto& ref3 = v.emplace<4>(3, 'a');
+ auto& ref3 = v.emplace<4>(3u, 'a');
static_assert(std::is_same_v<std::string&, decltype(ref3)>, "");
assert(std::get<4>(v) == "aaa");
assert(&ref3 == &std::get<4>(v));
diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
index e0a048a1afb..8e68823d24a 100644
--- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
+++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
@@ -111,7 +111,7 @@ void test_basic() {
assert(std::get<2>(v) == &x);
assert(&ref2 == &std::get<2>(v));
// emplace with multiple args
- auto& ref3 = v.emplace<std::string>(3, 'a');
+ auto& ref3 = v.emplace<std::string>(3u, 'a');
static_assert(std::is_same_v<std::string&, decltype(ref3)>, "");
assert(std::get<4>(v) == "aaa");
assert(&ref3 == &std::get<4>(v));
OpenPOWER on IntegriCloud