summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDecl.cpp
diff options
context:
space:
mode:
authorVassil Vassilev <v.g.vassilev@gmail.com>2016-05-18 15:14:46 +0000
committerVassil Vassilev <v.g.vassilev@gmail.com>2016-05-18 15:14:46 +0000
commit2ee10e6dc6191a73a317f1d2f3692c1d17c3ab9d (patch)
tree39f0152d047907fbc86bc1aed17b4c8ac5fba0e9 /clang/lib/Sema/SemaDecl.cpp
parente0026e4e21919300472f01e0d90af435d2c673ee (diff)
downloadbcm5719-llvm-2ee10e6dc6191a73a317f1d2f3692c1d17c3ab9d.tar.gz
bcm5719-llvm-2ee10e6dc6191a73a317f1d2f3692c1d17c3ab9d.zip
Teach Sema::MergeFunctionDecl to properly check for an out-of-line definition of a function that is declared as =default in its class definition.
First part of PR27699. Patch by Cristina Cristescu! Reviewed by Richard Smith and me. llvm-svn: 269935
Diffstat (limited to 'clang/lib/Sema/SemaDecl.cpp')
-rw-r--r--clang/lib/Sema/SemaDecl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 75aca834d2c..d34d9b5688c 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -2993,7 +2993,7 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, NamedDecl *&OldD,
<< New << getSpecialMember(OldMethod);
return true;
}
- } else if (OldMethod->isExplicitlyDefaulted() && !isFriend) {
+ } else if (OldMethod->getFirstDecl()->isExplicitlyDefaulted() && !isFriend) {
Diag(NewMethod->getLocation(),
diag::err_definition_of_explicitly_defaulted_member)
<< getSpecialMember(OldMethod);
OpenPOWER on IntegriCloud