[llvm-branch-commits] [cfe-branch] r156688 - /cfe/branches/release_31/lib/Parse/ParseDecl.cpp

[Bill Wendling]

Author: void
Date: Fri May 11 19:46:04 2012
New Revision: 156688

URL: http://llvm.org/viewvc/llvm-project?rev=156688&view=rev
Log:
Fix accidental merge error.

Modified:
    cfe/branches/release_31/lib/Parse/ParseDecl.cpp

Modified: cfe/branches/release_31/lib/Parse/ParseDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_31/lib/Parse/ParseDecl.cpp?rev=156688&r1=156687&r2=156688&view=diff
==============================================================================
--- cfe/branches/release_31/lib/Parse/ParseDecl.cpp (original)
+++ cfe/branches/release_31/lib/Parse/ParseDecl.cpp Fri May 11 19:46:04 2012
@@ -4265,18 +4265,7 @@
                                IsCXX11MemberFunction);
 
       // Parse exception-specification[opt].
-      // FIXME: Remove the code to perform delayed parsing of exception
-      //        specifications.
-#if 0
-      bool Delayed = (D.getContext() == Declarator::MemberContext &&
-                      D.getDeclSpec().getStorageClassSpec()
-                        != DeclSpec::SCS_typedef &&
-                      !D.getDeclSpec().isFriendSpecified());
-#else
-      const bool Delayed = false;
-#endif
-      ESpecType = tryParseExceptionSpecification(Delayed,
-                                                 ESpecRange,
+      ESpecType = tryParseExceptionSpecification(ESpecRange,
                                                  DynamicExceptions,
                                                  DynamicExceptionRanges,
                                                  NoexceptExpr);