summaryrefslogtreecommitdiffstats
path: root/test/CXX/special/class.copy/implicit-move.cpp
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2012-05-22 21:36:38 +0000
committerdim <dim@FreeBSD.org>2012-05-22 21:36:38 +0000
commite6d4a67235c1e62e3e292b1a167c5c6b9610a706 (patch)
tree1bfa44f5a9427d658426ac7786a70741e36d1bc8 /test/CXX/special/class.copy/implicit-move.cpp
parent822bde9df508e0b9afac5e581b0d6ab403417a28 (diff)
downloadFreeBSD-src-e6d4a67235c1e62e3e292b1a167c5c6b9610a706.zip
FreeBSD-src-e6d4a67235c1e62e3e292b1a167c5c6b9610a706.tar.gz
Vendor import of clang release_31 final r156748:
http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_31/final@156748
Diffstat (limited to 'test/CXX/special/class.copy/implicit-move.cpp')
-rw-r--r--test/CXX/special/class.copy/implicit-move.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/CXX/special/class.copy/implicit-move.cpp b/test/CXX/special/class.copy/implicit-move.cpp
index b1b298e..3e9accfb 100644
--- a/test/CXX/special/class.copy/implicit-move.cpp
+++ b/test/CXX/special/class.copy/implicit-move.cpp
@@ -198,15 +198,15 @@ namespace DR1402 {
struct NoMove4 : NonTrivialCopyAssign {}; // expected-note 2{{'const DR1402::NoMove4 &'}}
struct NoMove5 : virtual NonTrivialCopyCtor {}; // expected-note 2{{'const DR1402::NoMove5 &'}}
struct NoMove6 : virtual NonTrivialCopyAssign {}; // expected-note 2{{'const DR1402::NoMove6 &'}}
- struct NoMove7 : NonTrivialCopyCtorVBase {}; // expected-note 2{{'DR1402::NoMove7 &'}}
- struct NoMove8 : NonTrivialCopyAssignVBase {}; // expected-note 2{{'DR1402::NoMove8 &'}}
+ struct NoMove7 : NonTrivialCopyCtorVBase {}; // expected-note 2{{'const DR1402::NoMove7 &'}}
+ struct NoMove8 : NonTrivialCopyAssignVBase {}; // expected-note 2{{'const DR1402::NoMove8 &'}}
// A non-trivially-move-assignable virtual base class inhibits the declaration
// of a move assignment (which might move-assign the base class multiple
// times).
struct NoMove9 : NonTrivialMoveAssign {};
- struct NoMove10 : virtual NonTrivialMoveAssign {}; // expected-note {{'DR1402::NoMove10 &'}}
- struct NoMove11 : NonTrivialMoveAssignVBase {}; // expected-note {{'DR1402::NoMove11 &'}}
+ struct NoMove10 : virtual NonTrivialMoveAssign {}; // expected-note {{'const DR1402::NoMove10 &'}}
+ struct NoMove11 : NonTrivialMoveAssignVBase {}; // expected-note {{'const DR1402::NoMove11 &'}}
struct Test {
friend NoMove1::NoMove1(NoMove1 &&); // expected-error {{no matching function}}
OpenPOWER on IntegriCloud