diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-22 16:52:41 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-22 16:52:41 +0000 |
| commit | 5df539a1004bc4db5c38b33ba3e219595a10ae3c (patch) | |
| tree | 8f7162c2eeb96f9bef560b568c3a039187a31953 /test/CXX/special/class.inhctor/p1.cpp | |
| parent | d2e0a8dd949ab874c6d66f97106bd5c270e2fa7d (diff) | |
Vendor import of clang release_40 branch r292732:vendor/clang/clang-release_40-r292732
Notes
Notes:
svn path=/vendor/clang/dist/; revision=312627
svn path=/vendor/clang/clang-release_40-r292732/; revision=312628; tag=vendor/clang/clang-release_40-r292732
Diffstat (limited to 'test/CXX/special/class.inhctor/p1.cpp')
| -rw-r--r-- | test/CXX/special/class.inhctor/p1.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/CXX/special/class.inhctor/p1.cpp b/test/CXX/special/class.inhctor/p1.cpp index c006abe3506f..45f6049b4598 100644 --- a/test/CXX/special/class.inhctor/p1.cpp +++ b/test/CXX/special/class.inhctor/p1.cpp @@ -3,7 +3,7 @@ // Note: [class.inhctor] was removed by P0136R1. This tests the new behavior // for the wording that used to be there. -struct A { // expected-note 8{{candidate is the implicit}} +struct A { // expected-note 4{{candidate is the implicit}} A(...); // expected-note 4{{candidate constructor}} expected-note 4{{candidate inherited constructor}} A(int = 0, int = 0, int = 0, int = 0, ...); // expected-note 3{{candidate constructor}} expected-note 3{{candidate inherited constructor}} A(int = 0, int = 0, ...); // expected-note 3{{candidate constructor}} expected-note 3{{candidate inherited constructor}} @@ -15,7 +15,7 @@ struct A { // expected-note 8{{candidate is the implicit}} }; struct B : A { // expected-note 4{{candidate is the implicit}} - using A::A; // expected-note 19{{inherited here}} + using A::A; // expected-note 15{{inherited here}} B(void*); }; |