Fix accidental merge error.

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

1 files changed, 1 insertions, 12 deletions

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index eebe3a28e3..7995e68d3f 100644
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -4265,18 +4265,7 @@ void Parser::ParseFunctionDeclarator(Declarator &D,
                                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);