diff options
Diffstat (limited to 'libcxx/test/std/containers')
5 files changed, 11 insertions, 4 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp b/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp index f7442f4cfb9..af2d35c66ec 100644 --- a/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret[v] = v + 10; + ret[static_cast<typename M::key_type>(v)] = static_cast<typename M::mapped_type>(v + 10); return ret; } diff --git a/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp index 4655da4b2dc..6f2d56a9730 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret.insert(typename M::value_type(v, v + 10)); + ret.emplace(static_cast<typename M::key_type>(v), static_cast<typename M::mapped_type>(v + 10)); return ret; } diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp index 28c51eb0348..2b3b212aecd 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp @@ -156,7 +156,14 @@ void test_ctor_with_different_value_type() { // Make sure initialization is performed with each element value, not with // a memory blob. float array[3] = {0.0f, 1.0f, 2.0f}; +#ifdef TEST_COMPILER_C1XX + #pragma warning(push) + #pragma warning(disable: 4244) // conversion from 'float' to 'int', possible loss of data +#endif // TEST_COMPILER_C1XX std::vector<int> v(array, array + 3); +#ifdef TEST_COMPILER_C1XX + #pragma warning(pop) +#endif // TEST_COMPILER_C1XX assert(v[0] == 0); assert(v[1] == 1); assert(v[2] == 2); diff --git a/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp b/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp index 652e6f6b49f..2f188655ca8 100644 --- a/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret[v] = v + 10; + ret[static_cast<typename M::key_type>(v)] = static_cast<typename M::mapped_type>(v + 10); return ret; } diff --git a/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp index 6da279e915d..23d18872d14 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret.insert(typename M::value_type(v, v + 10)); + ret.emplace(static_cast<typename M::key_type>(v), static_cast<typename M::mapped_type>(v + 10)); return ret; } |
