diff options
Diffstat (limited to 'test/SemaCXX/cxx1y-variable-templates_in_class.cpp')
| -rw-r--r-- | test/SemaCXX/cxx1y-variable-templates_in_class.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/SemaCXX/cxx1y-variable-templates_in_class.cpp b/test/SemaCXX/cxx1y-variable-templates_in_class.cpp index 76f1bb9905b9..66f0f10f0f3d 100644 --- a/test/SemaCXX/cxx1y-variable-templates_in_class.cpp +++ b/test/SemaCXX/cxx1y-variable-templates_in_class.cpp @@ -17,8 +17,7 @@ class A { template<typename T> CONST float right<float,T> = 5; // expected-error {{member 'right' declared as a template}} template<> static CONST int right<int,int> = 7; // expected-error {{explicit specialization of 'right' in class scope}} template<> static CONST float right<float,int>; // expected-error {{explicit specialization of 'right' in class scope}} - template static CONST int right<int,int>; // expected-error {{template specialization requires 'template<>'}} \ - // expected-error {{explicit specialization of 'right' in class scope}} + template static CONST int right<int,int>; // expected-error {{expected '<' after 'template'}} }; namespace out_of_line { @@ -166,8 +165,7 @@ namespace constexpred { template<typename T> constexpr float right<float,T> = 5; // expected-error {{non-static data member cannot be constexpr; did you intend to make it static?}} template<> static constexpr int right<int,int> = 7; // expected-error {{explicit specialization of 'right' in class scope}} template<> static constexpr float right<float,int>; // expected-error {{explicit specialization of 'right' in class scope}} - template static constexpr int right<int,int>; // expected-error {{template specialization requires 'template<>'}} \ - // expected-error {{explicit specialization of 'right' in class scope}} + template static constexpr int right<int,int>; // expected-error {{expected '<' after 'template'}} }; } #endif |