diff options
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/CXX/dcl.decl/dcl.meaning/p1.cpp | 15 | ||||
| -rw-r--r-- | clang/test/CXX/temp/p3.cpp | 4 | ||||
| -rw-r--r-- | clang/test/SemaCXX/nested-name-spec.cpp | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/clang/test/CXX/dcl.decl/dcl.meaning/p1.cpp b/clang/test/CXX/dcl.decl/dcl.meaning/p1.cpp index 9aa3a20bcd6..3672ea0ea08 100644 --- a/clang/test/CXX/dcl.decl/dcl.meaning/p1.cpp +++ b/clang/test/CXX/dcl.decl/dcl.meaning/p1.cpp @@ -20,3 +20,18 @@ namespace PR8019 { }; } + +namespace NS { + void foo(); + extern int bar; + struct X; + template<typename T> struct Y; + template<typename T> void wibble(T); +} +namespace NS { + void NS::foo() {} // expected-warning{{extra qualification on member 'foo'}} + int NS::bar; // expected-warning{{extra qualification on member 'bar'}} + struct NS::X { }; // expected-warning{{extra qualification on member 'X'}} + template<typename T> struct NS::Y; // expected-warning{{extra qualification on member 'Y'}} + template<typename T> void NS::wibble(T) { } // expected-warning{{extra qualification on member 'wibble'}} +} diff --git a/clang/test/CXX/temp/p3.cpp b/clang/test/CXX/temp/p3.cpp index 16ebb381fd1..c146bc4faad 100644 --- a/clang/test/CXX/temp/p3.cpp +++ b/clang/test/CXX/temp/p3.cpp @@ -6,11 +6,9 @@ template<typename T> struct S { template<typename T> int S<T>::a, S<T>::b; // expected-error {{can only declare a single entity}} -// FIXME: the last two diagnostics here are terrible. template<typename T> struct A { static A a; } A<T>::a; // expected-error {{expected ';' after struct}} \ expected-error {{use of undeclared identifier 'T'}} \ - expected-error {{cannot name the global scope}} \ - expected-error {{no member named 'a' in the global namespace}} + expected-warning{{extra qualification}} template<typename T> struct B { } f(); // expected-error {{expected ';' after struct}} \ expected-error {{requires a type specifier}} diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp index 6b3cb23e2aa..a60b115695d 100644 --- a/clang/test/SemaCXX/nested-name-spec.cpp +++ b/clang/test/SemaCXX/nested-name-spec.cpp @@ -160,7 +160,7 @@ namespace N { void f(); // FIXME: if we move this to a separate definition of N, things break! } -void ::global_func2(int) { } // expected-error{{definition or redeclaration of 'global_func2' cannot name the global scope}} +void ::global_func2(int) { } // expected-warning{{extra qualification on member 'global_func2'}} void N::f() { } // okay |
