STL_MSFT created this revision.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.
[libcxx] [test] Fix MSVC warning C4245 "conversion from 'X' to 'Y',
signed/unsigned mismatch", part 6/12.
Add static_cast when initializing unsigned integers with negative numbers (in
order to obtain big values).
https://reviews.llvm.org/D27019
Files:
test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
Index: test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
===================================================================
--- test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
+++ test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp
@@ -45,7 +45,7 @@
{
const my_facet f(1);
std::ios ios(0);
- unsigned short v = -1;
+ unsigned short v = static_cast<unsigned short>(-1);
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
Index: test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
===================================================================
--- test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
+++ test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp
@@ -45,7 +45,7 @@
{
const my_facet f(1);
std::ios ios(0);
- unsigned long long v = -1;
+ unsigned long long v = static_cast<unsigned long long>(-1);
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
Index: test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
===================================================================
--- test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
+++ test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp
@@ -45,7 +45,7 @@
{
const my_facet f(1);
std::ios ios(0);
- unsigned long v = -1;
+ unsigned long v = static_cast<unsigned long>(-1);
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
Index: test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
===================================================================
--- test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
+++ test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp
@@ -45,7 +45,7 @@
{
const my_facet f(1);
std::ios ios(0);
- unsigned int v = -1;
+ unsigned int v = static_cast<unsigned int>(-1);
{
const char str[] = "0";
std::ios_base::iostate err = ios.goodbit;
Index: test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
===================================================================
--- test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
+++ test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp
@@ -61,15 +61,15 @@
}
{
std::ios ios(0);
- unsigned long long v = -1;
+ unsigned long long v = static_cast<unsigned long long>(-1);
char str[50];
output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base());
assert(ex == (sizeof(unsigned long long) == 4 ? "4294967295" : "18446744073709551615"));
}
{
std::ios ios(0);
- unsigned long long v = -1000;
+ unsigned long long v = static_cast<unsigned long long>(-1000);
char str[50];
output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base());
@@ -307,7 +307,7 @@
{
std::ios ios(0);
ios.imbue(std::locale(std::locale::classic(), new my_numpunct));
- unsigned long long v = -1000;
+ unsigned long long v = static_cast<unsigned long long>(-1000);
right(ios);
showpos(ios);
ios.width(10);
@@ -320,7 +320,7 @@
{
std::ios ios(0);
ios.imbue(std::locale(std::locale::classic(), new my_numpunct));
- unsigned long long v = -1000;
+ unsigned long long v = static_cast<unsigned long long>(-1000);
left(ios);
ios.width(10);
char str[50];
@@ -332,7 +332,7 @@
{
std::ios ios(0);
ios.imbue(std::locale(std::locale::classic(), new my_numpunct));
- unsigned long long v = -1000;
+ unsigned long long v = static_cast<unsigned long long>(-1000);
internal(ios);
ios.width(10);
char str[50];
Index: test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
===================================================================
--- test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
+++ test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp
@@ -61,15 +61,15 @@
}
{
std::ios ios(0);
- unsigned long v = -1;
+ unsigned long v = static_cast<unsigned long>(-1);
char str[50];
output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base());
assert(ex == (sizeof(unsigned long) == 4 ? "4294967295" : "18446744073709551615"));
}
{
std::ios ios(0);
- unsigned long v = -1000;
+ unsigned long v = static_cast<unsigned long>(-1000);
char str[50];
output_iterator<char*> iter = f.put(output_iterator<char*>(str), ios, '*', v);
std::string ex(str, iter.base());
@@ -307,7 +307,7 @@
{
std::ios ios(0);
ios.imbue(std::locale(std::locale::classic(), new my_numpunct));
- unsigned long v = -1000;
+ unsigned long v = static_cast<unsigned long>(-1000);
right(ios);
showpos(ios);
ios.width(10);
@@ -321,7 +321,7 @@
{
std::ios ios(0);
ios.imbue(std::locale(std::locale::classic(), new my_numpunct));
- unsigned long v = -1000;
+ unsigned long v = static_cast<unsigned long>(-1000);
left(ios);
ios.width(10);
char str[50];
@@ -334,7 +334,7 @@
{
std::ios ios(0);
ios.imbue(std::locale(std::locale::classic(), new my_numpunct));
- unsigned long v = -1000;
+ unsigned long v = static_cast<unsigned long>(-1000);
internal(ios);
ios.width(10);
char str[50];
Index: test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
===================================================================
--- test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
+++ test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp
@@ -76,7 +76,7 @@
testbuf<char> sb;
std::ostream os(&sb);
hex(os);
- unsigned long long n = -10;
+ unsigned long long n = static_cast<unsigned long long>(-10);
os << n;
assert(sb.str() == "fffffffffffffff6");
}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
