summaryrefslogtreecommitdiffstats
path: root/clang/lib/AST/Decl.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2017-12-02 00:55:48 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2017-12-02 00:55:48 +0000
commita22d9a5c51cac42f61351ea13fd296f136f827c6 (patch)
treef99ece62e13b9b1ac7bac48cdd54b22533782199 /clang/lib/AST/Decl.cpp
parent2278826c6066a09723bc11b6b53e13274ada9e9b (diff)
downloadbcm5719-llvm-a22d9a5c51cac42f61351ea13fd296f136f827c6.tar.gz
bcm5719-llvm-a22d9a5c51cac42f61351ea13fd296f136f827c6.zip
Move comment back to being next to the code it's a comment for.
llvm-svn: 319601
Diffstat (limited to 'clang/lib/AST/Decl.cpp')
-rw-r--r--clang/lib/AST/Decl.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index a755e61b753..41c4fd0e6c0 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -1974,6 +1974,9 @@ VarDecl *VarDecl::getCanonicalDecl() { return getFirstDecl(); }
VarDecl::DefinitionKind
VarDecl::isThisDeclarationADefinition(ASTContext &C) const {
+ if (isThisDeclarationADemotedDefinition())
+ return DeclarationOnly;
+
// C++ [basic.def]p2:
// A declaration is a definition unless [...] it contains the 'extern'
// specifier or a linkage-specification and neither an initializer [...],
@@ -1987,9 +1990,6 @@ VarDecl::isThisDeclarationADefinition(ASTContext &C) const {
//
// FIXME: How do you declare (but not define) a partial specialization of
// a static data member template outside the containing class?
- if (isThisDeclarationADemotedDefinition())
- return DeclarationOnly;
-
if (isStaticDataMember()) {
if (isOutOfLine() &&
!(getCanonicalDecl()->isInline() &&
OpenPOWER on IntegriCloud