diff options
| -rw-r--r-- | include/clang/Parse/Parser.h | 4 | ||||
| -rw-r--r-- | include/clang/Sema/Sema.h | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseTemplate.cpp | 4 | ||||
| -rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h index 0880e5416e..2d91bc84bb 100644 --- a/include/clang/Parse/Parser.h +++ b/include/clang/Parse/Parser.h @@ -937,8 +937,8 @@ private: LateParsedTemplateMapT; LateParsedTemplateMapT LateParsedTemplateMap; - static void LateTemplateParserCallback(void *P, FunctionDecl *FD); - void LateTemplateParser(FunctionDecl *FD); + static void LateTemplateParserCallback(void *P, const FunctionDecl *FD); + void LateTemplateParser(const FunctionDecl *FD); Sema::ParsingClassState PushParsingClass(Decl *TagOrTemplate, bool TopLevelClass); diff --git a/include/clang/Sema/Sema.h b/include/clang/Sema/Sema.h index 3694d7e354..21e5d945c9 100644 --- a/include/clang/Sema/Sema.h +++ b/include/clang/Sema/Sema.h @@ -308,7 +308,7 @@ public: llvm::SmallVector<const DeclaratorDecl*, 4> UnusedFileScopedDecls; /// \brief Callback to the parser to parse templated functions when needed. - typedef void LateTemplateParserCB(void *P, FunctionDecl *FD); + typedef void LateTemplateParserCB(void *P, const FunctionDecl *FD); LateTemplateParserCB *LateTemplateParser; void *OpaqueParser; diff --git a/lib/Parse/ParseTemplate.cpp b/lib/Parse/ParseTemplate.cpp index f21e09152b..12e38daf00 100644 --- a/lib/Parse/ParseTemplate.cpp +++ b/lib/Parse/ParseTemplate.cpp @@ -1128,12 +1128,12 @@ SourceRange Parser::ParsedTemplateInfo::getSourceRange() const { return R; } -void Parser::LateTemplateParserCallback(void *P, FunctionDecl *FD) { +void Parser::LateTemplateParserCallback(void *P, const FunctionDecl *FD) { ((Parser*)P)->LateTemplateParser(FD); } -void Parser::LateTemplateParser(FunctionDecl *FD) { +void Parser::LateTemplateParser(const FunctionDecl *FD) { LateParsedTemplatedFunction *LPT = LateParsedTemplateMap[FD]; if (LPT) { ParseLateTemplatedFuncDef(*LPT); diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index c972c6602e..c4e171e637 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2273,7 +2273,7 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation, // a templated function definition. if (!Pattern && PatternDecl && PatternDecl->isLateTemplateParsed() && LateTemplateParser) { - LateTemplateParser(OpaqueParser, (FunctionDecl*)PatternDecl); + LateTemplateParser(OpaqueParser, PatternDecl); Pattern = PatternDecl->getBody(PatternDecl); } |