diff options
Diffstat (limited to 'test/CXX/special/class.inhctor/p1.cpp')
-rw-r--r-- | test/CXX/special/class.inhctor/p1.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/CXX/special/class.inhctor/p1.cpp b/test/CXX/special/class.inhctor/p1.cpp index 8721dec..fa0416e 100644 --- a/test/CXX/special/class.inhctor/p1.cpp +++ b/test/CXX/special/class.inhctor/p1.cpp @@ -2,31 +2,30 @@ // Per a core issue (no number yet), an ellipsis is always dropped. struct A { A(...); // expected-note {{here}} - A(int = 0, int = 0, int = 0, int = 0, ...); // expected-note 9{{here}} + A(int = 0, int = 0, int = 0, int = 0, ...); // expected-note 9{{here}} expected-note 2{{constructor cannot be inherited}} A(int = 0, int = 0, ...); // expected-note {{here}} template<typename T> A(T, int = 0, ...); // expected-note 5{{here}} - template<typename T, int N> A(const T (&)[N]); // expected-note 2{{here}} + template<typename T, int N> A(const T (&)[N]); // expected-note 2{{here}} expected-note {{constructor cannot be inherited}} template<typename T, int N> A(const T (&)[N], int = 0); // expected-note 2{{here}} }; struct B : A { // expected-note 6{{candidate}} - using A::A; // expected-warning 4{{inheriting constructor does not inherit ellipsis}} expected-note 16{{candidate}} expected-note 3{{deleted}} + using A::A; // expected-warning 4{{inheriting constructor does not inherit ellipsis}} expected-note 16{{candidate}} expected-note 3{{deleted constructor was inherited here}} }; struct C {} c; B b0{}; -// expected-error@-1 {{call to implicitly-deleted default constructor}} +// expected-error@-1 {{call to implicitly-deleted default constructor of 'B'}} // expected-note@-8 {{default constructor of 'B' is implicitly deleted because base class 'A' has multiple default constructors}} B b1{1}; -// FIXME: explain why the inheriting constructor was deleted -// expected-error@-2 {{call to implicitly-deleted function of 'B'}} +// expected-error@-1 {{call to deleted constructor of 'B'}} B b2{1,2}; -// expected-error@-1 {{call to implicitly-deleted function of 'B'}} +// expected-error@-1 {{call to deleted constructor of 'B'}} B b3{1,2,3}; // ok |