diff options
author | Daniel Dunbar <daniel@zuster.org> | 2010-05-11 21:32:35 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2010-05-11 21:32:35 +0000 |
commit | 380c2139959d8608782292984b457640a143a70d (patch) | |
tree | 9d19ddf00d7bec1e6a550bfe5c595295e736909a /test/SemaCXX/default-assignment-operator.cpp | |
parent | 9430d5a61598c47d827e1cd05f7cf3f110eeec9e (diff) |
Speculatively revert r103497, "Do not mark the virtual members of an
implicitly-instantiated class as ...", which seems to have broken bootstrap.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103515 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaCXX/default-assignment-operator.cpp')
-rw-r--r-- | test/SemaCXX/default-assignment-operator.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/test/SemaCXX/default-assignment-operator.cpp b/test/SemaCXX/default-assignment-operator.cpp index 0be5df39b1..4b5531e0c8 100644 --- a/test/SemaCXX/default-assignment-operator.cpp +++ b/test/SemaCXX/default-assignment-operator.cpp @@ -7,8 +7,7 @@ class Base { // expected-error {{cannot define the implicit default assignment o }; class X : Base { // // expected-error {{cannot define the implicit default assignment operator for 'X', because non-static const member 'cint' can't use default assignment operator}} \ -// expected-note{{assignment operator for 'Base' first required here}} \ - // expected-note{{implicit default copy assignment operator}} +// expected-note{{assignment operator for 'Base' first required here}} public: X(); const int cint; // expected-note {{declared here}} @@ -29,8 +28,7 @@ Z z2; // Test1 void f(X x, const X cx) { - x = cx; // expected-note{{assignment operator for 'X' first required here}} \ - // expected-note{{implicit default copy assignment operator}} + x = cx; // expected-note{{assignment operator for 'X' first required here}} x = cx; z1 = z2; } @@ -86,9 +84,7 @@ public: E1 e1, e2; void j() { - // FIXME: duplicated! - e1 = e2; // expected-note{{assignment operator for 'E1' first required here}} \ - // expected-note{{implicit default copy assignment operator}} + e1 = e2; // expected-note{{assignment operator for 'E1' first required here}} } namespace ProtectedCheck { @@ -105,8 +101,7 @@ namespace ProtectedCheck { X x; }; - void f(Z z) { z = z; } // expected-note{{implicit default copy assignment operator}} - + void f(Z z) { z = z; } // } namespace MultiplePaths { |