diff options
author | Richard Trieu <rtrieu@google.com> | 2016-04-22 22:14:32 +0000 |
---|---|---|
committer | Richard Trieu <rtrieu@google.com> | 2016-04-22 22:14:32 +0000 |
commit | 891f0f176ced7ad579a8c2afca2059c22f49093f (patch) | |
tree | e2a33747eb9ba7705140ada9a1992b869308735e /clang/test/CXX | |
parent | 0b9531c8e643d63fad0c2b4f3e6738678c421c59 (diff) | |
download | bcm5719-llvm-891f0f176ced7ad579a8c2afca2059c22f49093f.tar.gz bcm5719-llvm-891f0f176ced7ad579a8c2afca2059c22f49093f.zip |
Revert the bool portion of r267054
Remove the floating point to bool conversion warnings. Some of these
conversions will be caught by -Wliteral-conversion and -Wfloat-conversion
llvm-svn: 267234
Diffstat (limited to 'clang/test/CXX')
-rw-r--r-- | clang/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-0x.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-0x.cpp b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-0x.cpp index 022b3111b64..48c5b23207c 100644 --- a/clang/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-0x.cpp +++ b/clang/test/CXX/dcl.decl/dcl.init/dcl.init.list/p7-0x.cpp @@ -58,8 +58,8 @@ void float_to_int() { Agg<char> ce1 = { Convert<float>(1.0) }; // expected-error {{type 'float' cannot be narrowed to 'char'}} expected-note {{silence}} Agg<char> ce2 = { ConvertVar<double>() }; // expected-error {{type 'double' cannot be narrowed to 'char'}} expected-note {{silence}} - bool b{1.0}; // expected-error {{type 'double' cannot be narrowed to 'bool'}} expected-note {{silence}} expected-warning {{changes value}} - Agg<bool> ab = {0.0}; // expected-error {{type 'double' cannot be narrowed to 'bool'}} expected-note {{silence}} expected-warning {{changes value}} + bool b{1.0}; // expected-error {{type 'double' cannot be narrowed to 'bool'}} expected-note {{silence}} + Agg<bool> ab = {0.0}; // expected-error {{type 'double' cannot be narrowed to 'bool'}} expected-note {{silence}} } // * from long double to double or float, or from double to float, except where |