diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-04-02 21:07:48 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-04-02 21:07:48 +0000 |
| commit | f989e51cb6721e8f6e46475d94726170536b85d3 (patch) | |
| tree | db87288ea84b08c4c88e3008efee1fe6080710b3 | |
| parent | e386b7b360d6508f974db64d43d13129e36e2b22 (diff) | |
| download | bcm5719-llvm-f989e51cb6721e8f6e46475d94726170536b85d3.tar.gz bcm5719-llvm-f989e51cb6721e8f6e46475d94726170536b85d3.zip | |
PR10217 diagnostic fix: don't say 'copy constructor' when we mean
'copy assignment operator'.
llvm-svn: 153897
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/special/class.copy/implicit-move.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 216663607ca..a6d564e3167 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -4668,7 +4668,7 @@ bool Sema::ShouldDeleteSpecialMember(CXXMethodDecl *MD, CXXSpecialMember CSM, if (UserDeclaredMove) { Diag(UserDeclaredMove->getLocation(), diag::note_deleted_copy_user_declared_move) - << (CSM == CXXMoveAssignment) << RD + << (CSM == CXXCopyAssignment) << RD << UserDeclaredMove->isMoveAssignmentOperator(); return true; } diff --git a/clang/test/CXX/special/class.copy/implicit-move.cpp b/clang/test/CXX/special/class.copy/implicit-move.cpp index 7c69dd8b87e..b1b298e893f 100644 --- a/clang/test/CXX/special/class.copy/implicit-move.cpp +++ b/clang/test/CXX/special/class.copy/implicit-move.cpp @@ -28,7 +28,7 @@ struct HasCopyAssignment { struct HasMoveConstructor { ThrowingCopy tc; HasMoveConstructor() noexcept; - HasMoveConstructor(HasMoveConstructor &&) noexcept; // expected-note {{deleted because 'HasMoveConstructor' has a user-declared move constructor}} + HasMoveConstructor(HasMoveConstructor &&) noexcept; // expected-note {{copy assignment operator is implicitly deleted because 'HasMoveConstructor' has a user-declared move constructor}} }; struct HasMoveAssignment { // expected-note {{implicit copy constructor}} |
