diff options
Diffstat (limited to 'lib/Sema/SemaTemplateInstantiateDecl.cpp')
-rw-r--r-- | lib/Sema/SemaTemplateInstantiateDecl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp index 66cb679372..4fea4002cb 100644 --- a/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -2672,16 +2672,15 @@ void Sema::InstantiateStaticDataMemberDefinition( } } -static MultiInitializer CreateMultiInitializer( - const SmallVectorImpl<Expr*> &Args, - const CXXCtorInitializer *Init) { +static MultiInitializer CreateMultiInitializer(SmallVectorImpl<Expr*> &Args, + const CXXCtorInitializer *Init) { // FIXME: This is a hack that will do slightly the wrong thing for an // initializer of the form foo({...}). // The right thing to do would be to modify InstantiateInitializer to create // the MultiInitializer. if (Args.size() == 1 && isa<InitListExpr>(Args[0])) return MultiInitializer(Args[0]); - return MultiInitializer(Init->getLParenLoc(), (Expr **)Args.data(), + return MultiInitializer(Init->getLParenLoc(), Args.data(), Args.size(), Init->getRParenLoc()); } |