diff options
Diffstat (limited to 'test/SemaCXX/constant-expression-cxx11.cpp')
| -rw-r--r-- | test/SemaCXX/constant-expression-cxx11.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/SemaCXX/constant-expression-cxx11.cpp b/test/SemaCXX/constant-expression-cxx11.cpp index a64207583dd5..578a057104a3 100644 --- a/test/SemaCXX/constant-expression-cxx11.cpp +++ b/test/SemaCXX/constant-expression-cxx11.cpp @@ -253,7 +253,7 @@ namespace FunctionPointers { static_assert(1 + Apply(Select(4), 5) + Apply(Select(3), 7) == 42, ""); - constexpr int Invalid = Apply(Select(0), 0); // expected-error {{must be initialized by a constant expression}} expected-note {{in call to 'Apply(0, 0)'}} + constexpr int Invalid = Apply(Select(0), 0); // expected-error {{must be initialized by a constant expression}} expected-note {{in call to 'Apply(nullptr, 0)'}} } @@ -1972,9 +1972,9 @@ namespace ZeroSizeTypes { namespace BadDefaultInit { template<int N> struct X { static const int n = N; }; - struct A { + struct A { // expected-error {{default member initializer for 'k' needed within definition of enclosing class}} int k = // expected-note {{default member initializer declared here}} - X<A().k>::n; // expected-error {{default member initializer for 'k' needed within definition of enclosing class}} + X<A().k>::n; // expected-note {{in evaluation of exception specification for 'BadDefaultInit::A::A' needed here}} }; // FIXME: The "constexpr constructor must initialize all members" diagnostic |