summaryrefslogtreecommitdiffstats
path: root/clang
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2011-09-24 17:48:06 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2011-09-24 17:48:06 +0000
commit46975ea682f4414ad2bcbee4d8c1ad7835354ec6 (patch)
tree189e533494566d4a26d77c26d38d98d1863fce06 /clang
parentb49c46c25cdc660a159d7c202475ece197772305 (diff)
downloadbcm5719-llvm-46975ea682f4414ad2bcbee4d8c1ad7835354ec6.tar.gz
bcm5719-llvm-46975ea682f4414ad2bcbee4d8c1ad7835354ec6.zip
Fix the expected error for narrowing conversions in generalized-initializers.cpp to
match what the actual implementation of the error looks like. llvm-svn: 140458
Diffstat (limited to 'clang')
-rw-r--r--clang/test/SemaCXX/generalized-initializers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/SemaCXX/generalized-initializers.cpp b/clang/test/SemaCXX/generalized-initializers.cpp
index 6e2bee7e301..cf1b61e683c 100644
--- a/clang/test/SemaCXX/generalized-initializers.cpp
+++ b/clang/test/SemaCXX/generalized-initializers.cpp
@@ -47,8 +47,8 @@ namespace integral {
{ const int a = {1}; static_assert(a == 1, ""); }
{ const int a{1, 2}; } // expected-error {{excess elements}}
{ const int a = {1, 2}; } // expected-error {{excess elements}}
- { const short a{100000}; } // expected-error {{narrowing conversion}}
- { const short a = {100000}; } // expected-error {{narrowing conversion}}
+ { const short a{100000}; } // expected-error {{cannot be narrowed}}
+ { const short a = {100000}; } // expected-error {{cannot be narrowed}}
}
int function_call() {
OpenPOWER on IntegriCloud