Fix various problems with matching out-of-line definitions of static

class members to the corresponding in-class declaration.

Diagnose the erroneous use of 'static' on out-of-line definitions of
class members. 

llvm-svn: 66740

1 files changed, 14 insertions, 0 deletions

diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp
index f75b279a449..eaca56c7252 100644
--- a/clang/test/SemaCXX/nested-name-spec.cpp
+++ b/clang/test/SemaCXX/nested-name-spec.cpp
@@ -2,6 +2,11 @@
 namespace A {
   struct C {
     static int cx;
+
+    static int cx2;
+
+    static int Ag1();
+    static int Ag2();
   };
   int ax;
   void Af();
@@ -11,6 +16,15 @@ A:: ; // expected-error {{expected unqualified-id}}
 ::A::ax::undef ex3; // expected-error {{expected a class or namespace}} expected-error {{invalid token after top level declarator}}
 A::undef1::undef2 ex4; // expected-error {{no member named 'undef1'}} expected-error {{invalid token after top level declarator}}
 
+int A::C::Ag1() { return 0; }
+
+static int A::C::Ag2() { return 0; } // expected-error{{'static' can not be specified on an out-of-line static member}}
+
+int A::C::cx = 17;
+
+
+static int A::C::cx2 = 17; // expected-error{{'static' can not be specified on an out-of-line static member}}
+
 class C2 {
   void m(); // expected-note{{member declaration nearly matches}}