aboutsummaryrefslogtreecommitdiff
path: root/test/SemaCXX/generalized-initializers.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/SemaCXX/generalized-initializers.cpp')
-rw-r--r--test/SemaCXX/generalized-initializers.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/SemaCXX/generalized-initializers.cpp b/test/SemaCXX/generalized-initializers.cpp
index 2f13151a53..fc903f0016 100644
--- a/test/SemaCXX/generalized-initializers.cpp
+++ b/test/SemaCXX/generalized-initializers.cpp
@@ -45,8 +45,9 @@ namespace integral {
{ const int a = {}; static_assert(a == 0, ""); }
{ const int a{1}; static_assert(a == 1, ""); }
{ const int a = {1}; static_assert(a == 1, ""); }
- { const int a{1, 2}; } // expected-error {{ too many initializers}}
- { const int a = {1, 2}; } // expected-error {{ too many initializers}}
+ { 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}}
}
@@ -158,7 +159,7 @@ namespace litb {
struct B {
template<typename ...T>
- B(initializer_list<int>, T ...);
+ B(std::initializer_list<int>, T ...);
};
// invalid (the first phase only considers init-list ctors)