commit 3b8c53b619c1c3d77632734d227566071459b9f5
author Anders Carlsson <andersca@mac.com> Thu Apr 22 05:40:53 2010 +0000
committer Anders Carlsson <andersca@mac.com> Thu Apr 22 05:40:53 2010 +0000
tree e2b10647f9d291d861f96bdd91b6834f59ca8b8a
parent 7e2f128354f631d44b3f6dbcd4cee1cc04bdf7b1

Re-land the patch that merges two diagnostics into one now that it passes self-host :)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@102050 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Sema/Sema.h

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 5333684..eaa1807 100644
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -924,12 +924,14 @@
                             Declarator *D = 0);
 
   enum CXXSpecialMember {
-    CXXDefaultConstructor = 0,
+    CXXInvalid = -1,
+    CXXConstructor = 0,
     CXXCopyConstructor = 1,
     CXXCopyAssignment = 2,
     CXXDestructor = 3
   };
   void DiagnoseNontrivial(const RecordType* Record, CXXSpecialMember mem);
+  CXXSpecialMember getSpecialMember(const CXXMethodDecl *MD);
 
   virtual DeclPtrTy ActOnIvar(Scope *S, SourceLocation DeclStart,
                               DeclPtrTy IntfDecl,