diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-07-01 07:24:18 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-07-01 07:24:18 +0000 |
| commit | 7655381aa1f27729966c16b16599fba802dacec1 (patch) | |
| tree | 4a735fa620254c614244e78bd8ecde31ee6a20c7 /clang/lib/Sema/SemaDecl.cpp | |
| parent | 6d4ed0583033169f4a83f352e6ef0bd9275e34fa (diff) | |
| download | bcm5719-llvm-7655381aa1f27729966c16b16599fba802dacec1.tar.gz bcm5719-llvm-7655381aa1f27729966c16b16599fba802dacec1.zip | |
[modules] Don't require the 'inline' specifier when merging an inline function;
any source of the inline nature is sufficient.
llvm-svn: 241146
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 1dec6fc1092..6508d6f04bb 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -10385,7 +10385,7 @@ Sema::CheckForFunctionRedefinition(FunctionDecl *FD, // through a deduced return type, or instantiate templates with local types. if (!hasVisibleDefinition(Definition) && (Definition->getFormalLinkage() == InternalLinkage || - Definition->isInlineSpecified() || + Definition->isInlined() || Definition->getDescribedFunctionTemplate() || Definition->getNumTemplateParameterLists())) return; |
