commit 1a6eb99d45e554ea5431d49c5cbcab4fc3d9f70e
author Kaelyn Uhrain <rikka@google.com> Mon Oct 10 18:01:37 2011 +0000
committer Kaelyn Uhrain <rikka@google.com> Mon Oct 10 18:01:37 2011 +0000
tree d89d48c4f477cadc4f51a8bf433ce1959ff3dc5e
parent 7571ba7015d18d715f686f8a4163c1ef412694a5

Give nicer note when a member redeclaration has or lacks 'const'

llvm-svn: 141555

clang/test/SemaCXX/function-redecl.cpp

diff --git a/clang/test/SemaCXX/function-redecl.cpp b/clang/test/SemaCXX/function-redecl.cpp
index 2bc04a6..b19bff6 100644
--- a/clang/test/SemaCXX/function-redecl.cpp
+++ b/clang/test/SemaCXX/function-redecl.cpp
@@ -62,7 +62,7 @@
 }
 
 class Bar {
-  void f(test1::Foo::Inner foo) const; // expected-note {{member declaration nearly matches}}
+  void f(test1::Foo::Inner foo) const; // expected-note {{member declaration does not match because it is const qualified}}
 };
 
 using test1::Foo;
@@ -79,3 +79,16 @@
 void Crash::cart(int count) const {} // expected-error {{out-of-line definition of 'cart' does not match any declaration in 'Crash'}}
 // ...while this one crashed clang
 void Crash::chart(int count) const {} // expected-error {{out-of-line definition of 'chart' does not match any declaration in 'Crash'}}
+
+class TestConst {
+ public:
+  int getit() const; // expected-note {{member declaration does not match because it is const qualified}}
+  void setit(int); // expected-note {{member declaration does not match because it is not const qualified}}
+};
+
+int TestConst::getit() { // expected-error {{out-of-line definition of 'getit' does not match any declaration in 'TestConst'}}
+  return 1;
+}
+
+void TestConst::setit(int) const { // expected-error {{out-of-line definition of 'setit' does not match any declaration in 'TestConst'}}
+}

clang/test/SemaCXX/nested-name-spec.cpp

diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp
index 8e73c3e..e13030c 100644
--- a/clang/test/SemaCXX/nested-name-spec.cpp
+++ b/clang/test/SemaCXX/nested-name-spec.cpp
@@ -27,10 +27,10 @@
 static int A::C::cx2 = 17; // expected-error{{'static' can}}
 
 class C2 {
-  void m(); // expected-note{{member declaration nearly matches}}
+  void m(); // expected-note{{member declaration does not match because it is not const qualified}}
 
   void f(const int& parm); // expected-note{{type of 1st parameter of member declaration does not match definition ('const int &' vs 'int')}}
-  void f(int) const; // expected-note{{member declaration nearly matches}}
+  void f(int) const; // expected-note{{member declaration does not match because it is const qualified}}
   void f(float);
 
   int x;
@@ -121,7 +121,7 @@
 
 
 class Operators {
-  Operators operator+(const Operators&) const; // expected-note{{member declaration nearly matches}}
+  Operators operator+(const Operators&) const; // expected-note{{member declaration does not match because it is const qualified}}
   operator bool();
 };