Merge branch 'master' into merge-2.067

This commit is contained in:
Martin 2015-07-18 16:02:51 +02:00
commit 4b6bd7ab52
13 changed files with 26 additions and 105 deletions

View file

@ -501,7 +501,7 @@ void DtoDeclareFunction(FuncDeclaration* fdecl)
fatal();
}
func->setCallingConv(gABI->callingConv(link));
func->setCallingConv(gABI->callingConv(func->getFunctionType(), link));
IF_LOG Logger::cout() << "func = " << *func << std::endl;