From: Stephan T. Lavavej Date: Wed, 23 Nov 2016 22:02:44 +0000 (+0000) Subject: [libcxx] [test] D27019: Fix MSVC warning C4245 "conversion from 'X' to 'Y', signed... X-Git-Tag: llvmorg-4.0.0-rc1~3767 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bbdf9b7d2b9eddf451b8f5991b00bb47c93f172c;p=platform%2Fupstream%2Fllvm.git [libcxx] [test] D27019: 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). llvm-svn: 287826 --- diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp index 25dc4d8..5077a3d 100644 --- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/unsigned_long_long.pass.cpp @@ -76,7 +76,7 @@ int main() testbuf sb; std::ostream os(&sb); hex(os); - unsigned long long n = -10; + unsigned long long n = static_cast(-10); os << n; assert(sb.str() == "fffffffffffffff6"); } diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp index a4f9e9e..cfa6382 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long.pass.cpp @@ -61,7 +61,7 @@ int main() } { std::ios ios(0); - unsigned long v = -1; + unsigned long v = static_cast(-1); char str[50]; output_iterator iter = f.put(output_iterator(str), ios, '*', v); std::string ex(str, iter.base()); @@ -69,7 +69,7 @@ int main() } { std::ios ios(0); - unsigned long v = -1000; + unsigned long v = static_cast(-1000); char str[50]; output_iterator iter = f.put(output_iterator(str), ios, '*', v); std::string ex(str, iter.base()); @@ -307,7 +307,7 @@ int main() { std::ios ios(0); ios.imbue(std::locale(std::locale::classic(), new my_numpunct)); - unsigned long v = -1000; + unsigned long v = static_cast(-1000); right(ios); showpos(ios); ios.width(10); @@ -321,7 +321,7 @@ int main() { std::ios ios(0); ios.imbue(std::locale(std::locale::classic(), new my_numpunct)); - unsigned long v = -1000; + unsigned long v = static_cast(-1000); left(ios); ios.width(10); char str[50]; @@ -334,7 +334,7 @@ int main() { std::ios ios(0); ios.imbue(std::locale(std::locale::classic(), new my_numpunct)); - unsigned long v = -1000; + unsigned long v = static_cast(-1000); internal(ios); ios.width(10); char str[50]; diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp index debbd5e..6700564 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_unsigned_long_long.pass.cpp @@ -61,7 +61,7 @@ int main() } { std::ios ios(0); - unsigned long long v = -1; + unsigned long long v = static_cast(-1); char str[50]; output_iterator iter = f.put(output_iterator(str), ios, '*', v); std::string ex(str, iter.base()); @@ -69,7 +69,7 @@ int main() } { std::ios ios(0); - unsigned long long v = -1000; + unsigned long long v = static_cast(-1000); char str[50]; output_iterator iter = f.put(output_iterator(str), ios, '*', v); std::string ex(str, iter.base()); @@ -307,7 +307,7 @@ int main() { 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(-1000); right(ios); showpos(ios); ios.width(10); @@ -320,7 +320,7 @@ int main() { 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(-1000); left(ios); ios.width(10); char str[50]; @@ -332,7 +332,7 @@ int main() { 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(-1000); internal(ios); ios.width(10); char str[50]; diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp index 2d10569..0665bf2 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_int.pass.cpp @@ -45,7 +45,7 @@ int main() { const my_facet f(1); std::ios ios(0); - unsigned int v = -1; + unsigned int v = static_cast(-1); { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp index 50f0ff5..03fa3d7 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long.pass.cpp @@ -45,7 +45,7 @@ int main() { const my_facet f(1); std::ios ios(0); - unsigned long v = -1; + unsigned long v = static_cast(-1); { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp index 31fbb2a..dcf4bf1 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_long_long.pass.cpp @@ -45,7 +45,7 @@ int main() { const my_facet f(1); std::ios ios(0); - unsigned long long v = -1; + unsigned long long v = static_cast(-1); { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit; diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp index 822b83e..283c8e6 100644 --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_unsigned_short.pass.cpp @@ -45,7 +45,7 @@ int main() { const my_facet f(1); std::ios ios(0); - unsigned short v = -1; + unsigned short v = static_cast(-1); { const char str[] = "0"; std::ios_base::iostate err = ios.goodbit;