aboutsummaryrefslogtreecommitdiff
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
commit3117e36769bdd666f8bbb9155b17ee1c4b060e38 (patch)
tree15d5ac3bf95400d9d29a6fdfb913e2a357f458c9
parent14b0c194b356a1204d081765b3e6699687bed97c (diff)
Fix the expected error for narrowing conversions in generalized-initializers.cpp to
match what the actual implementation of the error looks like. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@140458 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/SemaCXX/generalized-initializers.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/SemaCXX/generalized-initializers.cpp b/test/SemaCXX/generalized-initializers.cpp
index 6e2bee7e30..cf1b61e683 100644
--- a/test/SemaCXX/generalized-initializers.cpp
+++ b/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() {