diff options
Diffstat (limited to 'test/CXX/class')
-rw-r--r-- | test/CXX/class/class.friend/p1.cpp | 6 | ||||
-rw-r--r-- | test/CXX/class/class.nest/p1.cpp | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/test/CXX/class/class.friend/p1.cpp b/test/CXX/class/class.friend/p1.cpp index 96701b3b05a5..b83dfa36cd35 100644 --- a/test/CXX/class/class.friend/p1.cpp +++ b/test/CXX/class/class.friend/p1.cpp @@ -79,3 +79,9 @@ class PreDeclared; int myoperation(float f) { return (int) f; } + +template <typename T> +class B { + template <typename U> + friend B<U>() {} // expected-error {{must use a qualified name when declaring a constructor as a friend}} +}; diff --git a/test/CXX/class/class.nest/p1.cpp b/test/CXX/class/class.nest/p1.cpp index b0341da7c212..59bf50f42400 100644 --- a/test/CXX/class/class.nest/p1.cpp +++ b/test/CXX/class/class.nest/p1.cpp @@ -1,4 +1,6 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++98 %s +// RUN: %clang_cc1 -fsyntax-only -verify -std=c++11 %s class Outer { int x; @@ -7,7 +9,10 @@ class Outer { // C++11 does relax this rule (see 5.1.1.10) in the first case, but we need to enforce it in C++03 mode. class Inner { - static char a[sizeof(x)]; // expected-error {{invalid use of non-static data member 'x'}} + static char a[sizeof(x)]; +#if __cplusplus <= 199711L + // expected-error@-2 {{invalid use of non-static data member 'x'}} +#endif static char b[sizeof(sx)]; // okay static char c[sizeof(f)]; // expected-error {{call to non-static member function without an object argument}} }; |