summaryrefslogtreecommitdiff
path: root/test/CXX/class.access
diff options
context:
space:
mode:
authorMatt Beaumont-Gay <matthewbg@google.com>2011-05-19 23:44:42 +0000
committerMatt Beaumont-Gay <matthewbg@google.com>2011-05-19 23:44:42 +0000
commit1e55e91a257c4ddd4364656b048a3c345c366804 (patch)
tree05ccb3c72d7bf002d0f789a95184028a2912c0ce /test/CXX/class.access
parentc46d6410947b18ac4c52cff4d0f8021b10a57c1e (diff)
downloadclang-1e55e91a257c4ddd4364656b048a3c345c366804.tar.gz
Undo enough of r131143 to make private copy ctor diags say "copy constructor" again
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131706 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX/class.access')
-rw-r--r--test/CXX/class.access/p4.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/CXX/class.access/p4.cpp b/test/CXX/class.access/p4.cpp
index 3157b87f7e..f28a3714e7 100644
--- a/test/CXX/class.access/p4.cpp
+++ b/test/CXX/class.access/p4.cpp
@@ -224,12 +224,12 @@ namespace test6 {
private: A(const A &); // expected-note 2 {{declared private here}}
};
- class Test1 { A a; }; // expected-error {{field of type 'test6::A' has private constructor}}
+ class Test1 { A a; }; // expected-error {{field of type 'test6::A' has private copy constructor}}
void test1(const Test1 &t) {
Test1 a = t; // expected-note{{implicit default copy}}
}
- class Test2 : A {}; // expected-error {{base class 'test6::A' has private constructor}}
+ class Test2 : A {}; // expected-error {{base class 'test6::A' has private copy constructor}}
void test2(const Test2 &t) {
Test2 a = t; // expected-note{{implicit default copy}}
}