Commit 1ef34dea authored by Bill Wendling's avatar Bill Wendling
Browse files

Fix accidental merge error. 

llvm-svn: 156688
parent 17f8c463

clang/lib/Parse/ParseDecl.cpp

+1 −12
Original line number Diff line number Diff line
@@ -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);