diff options
| -rw-r--r-- | clang/include/clang/AST/DeclCXX.h | 5 | ||||
| -rw-r--r-- | clang/lib/AST/DeclCXX.cpp | 6 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/clang/include/clang/AST/DeclCXX.h b/clang/include/clang/AST/DeclCXX.h index ada3f18..7fdb820 100644 --- a/clang/include/clang/AST/DeclCXX.h +++ b/clang/include/clang/AST/DeclCXX.h @@ -595,12 +595,11 @@ public: /// addConversionFunction - Add a new conversion function to the /// list of conversion functions. - void addConversionFunction(ASTContext &Context, CXXConversionDecl *ConvDecl); + void addConversionFunction(CXXConversionDecl *ConvDecl); /// \brief Add a new conversion function template to the list of conversion /// functions. - void addConversionFunction(ASTContext &Context, - FunctionTemplateDecl *ConvDecl); + void addConversionFunction(FunctionTemplateDecl *ConvDecl); /// isAggregate - Whether this class is an aggregate (C++ /// [dcl.init.aggr]), which is a class with no user-declared diff --git a/clang/lib/AST/DeclCXX.cpp b/clang/lib/AST/DeclCXX.cpp index a9eca9b..abb5505 100644 --- a/clang/lib/AST/DeclCXX.cpp +++ b/clang/lib/AST/DeclCXX.cpp @@ -388,15 +388,13 @@ void CXXRecordDecl::addVisibleConversionFunction( VisibleConversions.addOverload(ConvDecl); } -void CXXRecordDecl::addConversionFunction(ASTContext &Context, - CXXConversionDecl *ConvDecl) { +void CXXRecordDecl::addConversionFunction(CXXConversionDecl *ConvDecl) { assert(!ConvDecl->getDescribedFunctionTemplate() && "Conversion function templates should cast to FunctionTemplateDecl."); Conversions.addOverload(ConvDecl); } -void CXXRecordDecl::addConversionFunction(ASTContext &Context, - FunctionTemplateDecl *ConvDecl) { +void CXXRecordDecl::addConversionFunction(FunctionTemplateDecl *ConvDecl) { assert(isa<CXXConversionDecl>(ConvDecl->getTemplatedDecl()) && "Function template is not a conversion function template"); Conversions.addOverload(ConvDecl); diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 79b017b..0adf3e8 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -2321,9 +2321,9 @@ Sema::DeclPtrTy Sema::ActOnConversionDeclarator(CXXConversionDecl *Conversion) { assert(Conversion->isInvalidDecl() && "Conversion should not get here."); } else if (FunctionTemplateDecl *ConversionTemplate = Conversion->getDescribedFunctionTemplate()) - ClassDecl->addConversionFunction(Context, ConversionTemplate); + ClassDecl->addConversionFunction(ConversionTemplate); else if (!Conversion->getPrimaryTemplate()) // ignore specializations - ClassDecl->addConversionFunction(Context, Conversion); + ClassDecl->addConversionFunction(Conversion); return DeclPtrTy::make(Conversion); } |