diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-05-12 00:46:04 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-05-12 00:46:04 +0000 |
| commit | 1ef34dea9a664662fea769a0b5769390dc7f30f0 (patch) | |
| tree | 2141fc288fe7974b30a424a3ed1c602fcbe2c64e | |
| parent | 17f8c463e736cecab837e9f224d9b011b0cc982f (diff) | |
| download | llvm-1ef34dea9a664662fea769a0b5769390dc7f30f0.zip llvm-1ef34dea9a664662fea769a0b5769390dc7f30f0.tar.gz llvm-1ef34dea9a664662fea769a0b5769390dc7f30f0.tar.bz2 | |
Fix accidental merge error.
llvm-svn: 156688
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index eebe3a2..7995e68 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/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); |