STL_MSFT created this revision. STL_MSFT added reviewers: EricWF, mclow.lists. STL_MSFT added a subscriber: cfe-commits.
[libcxx] [test] Fix MSVC warning C4244 "conversion from 'X' to 'Y', possible loss of data", part 4/7. Change char to long and remove some char casts. This preserves test coverage for tuple's heterogeneous comparisons, while avoiding int-to-char truncation warnings. https://reviews.llvm.org/D27541 Files: test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp
Index: test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.rel/lt.pass.cpp @@ -48,7 +48,7 @@ assert( (t1 >= t2)); } { - typedef std::tuple<char> T1; + typedef std::tuple<long> T1; typedef std::tuple<double> T2; const T1 t1(1); const T2 t2(1); @@ -58,7 +58,7 @@ assert( (t1 >= t2)); } { - typedef std::tuple<char> T1; + typedef std::tuple<long> T1; typedef std::tuple<double> T2; const T1 t1(1); const T2 t2(0.9); @@ -68,7 +68,7 @@ assert( (t1 >= t2)); } { - typedef std::tuple<char> T1; + typedef std::tuple<long> T1; typedef std::tuple<double> T2; const T1 t1(1); const T2 t2(1.1); @@ -78,118 +78,118 @@ assert(!(t1 >= t2)); } { - typedef std::tuple<char, int> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<long, int> T1; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); const T2 t2(1, 2); assert(!(t1 < t2)); assert( (t1 <= t2)); assert(!(t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<long, int> T1; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); const T2 t2(0.9, 2); assert(!(t1 < t2)); assert(!(t1 <= t2)); assert( (t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<long, int> T1; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); const T2 t2(1.1, 2); assert( (t1 < t2)); assert( (t1 <= t2)); assert(!(t1 > t2)); assert(!(t1 >= t2)); } { - typedef std::tuple<char, int> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<long, int> T1; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); const T2 t2(1, 1); assert(!(t1 < t2)); assert(!(t1 <= t2)); assert( (t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<long, int> T1; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); const T2 t2(1, 3); assert( (t1 < t2)); assert( (t1 <= t2)); assert(!(t1 > t2)); assert(!(t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 2, 3); assert(!(t1 < t2)); assert( (t1 <= t2)); assert(!(t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(0.9, 2, 3); assert(!(t1 < t2)); assert(!(t1 <= t2)); assert( (t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1.1, 2, 3); assert( (t1 < t2)); assert( (t1 <= t2)); assert(!(t1 > t2)); assert(!(t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 1, 3); assert(!(t1 < t2)); assert(!(t1 <= t2)); assert( (t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 3, 3); assert( (t1 < t2)); assert( (t1 <= t2)); assert(!(t1 > t2)); assert(!(t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 2, 2); assert(!(t1 < t2)); assert(!(t1 <= t2)); assert( (t1 > t2)); assert( (t1 >= t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 2, 4); assert( (t1 < t2)); @@ -199,8 +199,8 @@ } #if TEST_STD_VER > 11 { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; constexpr T1 t1(1, 2, 3); constexpr T2 t2(1, 2, 4); static_assert( (t1 < t2), ""); Index: test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp =================================================================== --- test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp +++ test/std/utilities/tuple/tuple.tuple/tuple.rel/eq.pass.cpp @@ -51,104 +51,104 @@ } { typedef std::tuple<int, double> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); - const T2 t2(1, char(2)); + const T2 t2(1, 2); assert(t1 == t2); assert(!(t1 != t2)); } { typedef std::tuple<int, double> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); - const T2 t2(1, char(3)); + const T2 t2(1, 3); assert(!(t1 == t2)); assert(t1 != t2); } { typedef std::tuple<int, double> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); - const T2 t2(1.1, char(2)); + const T2 t2(1.1, 2); assert(!(t1 == t2)); assert(t1 != t2); } { typedef std::tuple<int, double> T1; - typedef std::tuple<double, char> T2; + typedef std::tuple<double, long> T2; const T1 t1(1, 2); - const T2 t2(1.1, char(3)); + const T2 t2(1.1, 3); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 2, 3); assert(t1 == t2); assert(!(t1 != t2)); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1.1, 2, 3); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 3, 3); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 2, 4); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1, 3, 2); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1.1, 2, 2); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1.1, 3, 3); assert(!(t1 == t2)); assert(t1 != t2); } { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; const T1 t1(1, 2, 3); const T2 t2(1.1, 3, 2); assert(!(t1 == t2)); assert(t1 != t2); } #if TEST_STD_VER > 11 { - typedef std::tuple<char, int, double> T1; - typedef std::tuple<double, char, int> T2; + typedef std::tuple<long, int, double> T1; + typedef std::tuple<double, long, int> T2; constexpr T1 t1(1, 2, 3); constexpr T2 t2(1.1, 3, 2); static_assert(!(t1 == t2), "");
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits