commit 58dad7d97871e1f7e78a677dcdf6135273cfb717
author Alexis Hunt <alercah@gmail.com> Fri May 06 00:11:07 2011 +0000
committer Alexis Hunt <alercah@gmail.com> Fri May 06 00:11:07 2011 +0000
tree d670ca18c221500b44328dce22fc1fc88b2848e6
parent a7028848a1d413ad846a61e9f1b9969377220364

Revert r130912 in order to approach defaulted functions from the other
direction and not introduce things in the wrong place three different
times.

llvm-svn: 130968

clang/lib/Parse/ParseDeclCXX.cpp

diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index 9c464bc..7247c07 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -1648,8 +1648,6 @@
   ExprResult BitfieldSize;
   ExprResult Init;
   bool Deleted = false;
-  bool Defaulted = false;
-  SourceLocation DefLoc;
 
   while (1) {
     // member-declarator:
@@ -1681,11 +1679,6 @@
           Diag(Tok, diag::warn_deleted_function_accepted_as_extension);
         ConsumeToken();
         Deleted = true;
-      } else if (Tok.is(tok::kw_delete)) {
-        if (!getLang().CPlusPlus0x)
-          Diag(Tok, diag::warn_defaulted_function_accepted_as_extension);
-        DefLoc = ConsumeToken();
-        Defaulted = true;
       } else {
         Init = ParseInitializer();
         if (Init.isInvalid())
@@ -1717,10 +1710,6 @@
       ThisDecl = Actions.ActOnFriendFunctionDecl(getCurScope(), DeclaratorInfo,
                                                  /*IsDefinition*/ false,
                                                  move(TemplateParams));
-      if (Defaulted) {
-        Diag(DefLoc, diag::err_friends_define_only_namespace_scope);
-        ThisDecl->setInvalidDecl();
-      }
     } else {
       ThisDecl = Actions.ActOnCXXMemberDeclarator(getCurScope(), AS,
                                                   DeclaratorInfo,
@@ -1728,7 +1717,7 @@
                                                   BitfieldSize.release(),
                                                   VS, Init.release(),
                                                   /*IsDefinition*/Deleted,
-                                                  Deleted, Defaulted);
+                                                  Deleted);
     }
     if (ThisDecl)
       DeclsInGroup.push_back(ThisDecl);
@@ -1755,7 +1744,6 @@
     BitfieldSize = 0;
     Init = 0;
     Deleted = false;
-    Defaulted = false;
 
     // Attributes are only allowed on the second declarator.
     MaybeParseGNUAttributes(DeclaratorInfo);