diff options
Diffstat (limited to 'test/CXX/temp/temp.decls/temp.class/temp.static/p1.cpp')
-rw-r--r-- | test/CXX/temp/temp.decls/temp.class/temp.static/p1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/CXX/temp/temp.decls/temp.class/temp.static/p1.cpp b/test/CXX/temp/temp.decls/temp.class/temp.static/p1.cpp index 8a3168e5f806..b0305dd756a6 100644 --- a/test/CXX/temp/temp.decls/temp.class/temp.static/p1.cpp +++ b/test/CXX/temp/temp.decls/temp.class/temp.static/p1.cpp @@ -8,7 +8,7 @@ struct X0 { template<typename T> T X0<T>::value = 0; // expected-error{{no viable conversion}} -struct X1 { +struct X1 { X1(int); }; @@ -19,8 +19,8 @@ X1& get_X1() { return X0<X1>::value; } double*& get_double_ptr() { return X0<int*>::value; } // expected-error{{non-const lvalue reference to type 'double *' cannot bind to a value of unrelated type 'int *'}} -X2& get_X2() { +X2& get_X2() { return X0<X2>::value; // expected-note{{instantiation}} } - -template<typename T> T x; // expected-warning{{variable templates are a C++1y extension}} + +template<typename T> T x; // expected-warning{{variable templates are a C++14 extension}} |