diff options
Diffstat (limited to 'clang/test/CXX')
10 files changed, 36 insertions, 36 deletions
diff --git a/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p5-cxx0x.cpp b/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p5-cxx0x.cpp index edaa975a589..35ef3b57b0c 100644 --- a/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p5-cxx0x.cpp +++ b/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p5-cxx0x.cpp @@ -7,6 +7,6 @@ struct A { }; struct B : A { - using A::f<double>; // expected-error{{using declaration can not refer to a template specialization}} - using A::X<int>; // expected-error{{using declaration can not refer to a template specialization}} + using A::f<double>; // expected-error{{using declaration cannot refer to a template specialization}} + using A::X<int>; // expected-error{{using declaration cannot refer to a template specialization}} }; diff --git a/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p6-cxx0x.cpp b/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p6-cxx0x.cpp index c4b8849e58c..c2fb9590245 100644 --- a/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p6-cxx0x.cpp +++ b/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p6-cxx0x.cpp @@ -5,4 +5,4 @@ namespace A { namespace B { } } -using A::B; // expected-error{{using declaration can not refer to namespace}} +using A::B; // expected-error{{using declaration cannot refer to namespace}} diff --git a/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p8-cxx0x.cpp b/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p8-cxx0x.cpp index 78b5a41648a..7d39172af2e 100644 --- a/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p8-cxx0x.cpp +++ b/clang/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p8-cxx0x.cpp @@ -6,10 +6,10 @@ struct X { static int a; }; -using X::i; // expected-error{{using declaration can not refer to class member}} -using X::s; // expected-error{{using declaration can not refer to class member}} +using X::i; // expected-error{{using declaration cannot refer to class member}} +using X::s; // expected-error{{using declaration cannot refer to class member}} void f() { - using X::i; // expected-error{{using declaration can not refer to class member}} - using X::s; // expected-error{{using declaration can not refer to class member}} + using X::i; // expected-error{{using declaration cannot refer to class member}} + using X::s; // expected-error{{using declaration cannot refer to class member}} } diff --git a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/p3-0x.cpp b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/p3-0x.cpp index 02cc973018b..39d6e706b6c 100644 --- a/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/p3-0x.cpp +++ b/clang/test/CXX/dcl.dcl/dcl.spec/dcl.type/p3-0x.cpp @@ -2,12 +2,12 @@ using X = struct { // ok }; -template<typename T> using Y = struct { // expected-error {{can not be defined in a type alias template}} +template<typename T> using Y = struct { // expected-error {{cannot be defined in a type alias template}} }; class K { virtual ~K(); - operator struct S {} (); // expected-error{{'K::S' can not be defined in a type specifier}} + operator struct S {} (); // expected-error{{'K::S' cannot be defined in a type specifier}} }; struct A {}; @@ -18,26 +18,26 @@ void f() { for (struct S { S(int) {} } s : arr) { // expected-error {{types may not be defined in a for range declaration}} } - new struct T {}; // expected-error {{'T' can not be defined in a type specifier}} - new struct A {}; // expected-error {{'A' can not be defined in a type specifier}} + new struct T {}; // expected-error {{'T' cannot be defined in a type specifier}} + new struct A {}; // expected-error {{'A' cannot be defined in a type specifier}} - try {} catch (struct U {}) {} // expected-error {{'U' can not be defined in a type specifier}} + try {} catch (struct U {}) {} // expected-error {{'U' cannot be defined in a type specifier}} - (void)(struct V { V(int); })0; // expected-error {{'V' can not be defined in a type specifier}} + (void)(struct V { V(int); })0; // expected-error {{'V' cannot be defined in a type specifier}} - (void)dynamic_cast<struct W {}*>((K*)0); // expected-error {{'W' can not be defined in a type specifier}} - (void)static_cast<struct X {}*>(0); // expected-error {{'X' can not be defined in a type specifier}} - (void)reinterpret_cast<struct Y {}*>(0); // expected-error {{'Y' can not be defined in a type specifier}} - (void)const_cast<struct Z {}*>((const Z*)0); // expected-error {{'Z' can not be defined in a type specifier}} + (void)dynamic_cast<struct W {}*>((K*)0); // expected-error {{'W' cannot be defined in a type specifier}} + (void)static_cast<struct X {}*>(0); // expected-error {{'X' cannot be defined in a type specifier}} + (void)reinterpret_cast<struct Y {}*>(0); // expected-error {{'Y' cannot be defined in a type specifier}} + (void)const_cast<struct Z {}*>((const Z*)0); // expected-error {{'Z' cannot be defined in a type specifier}} } -void g() throw (struct Ex {}) { // expected-error {{'Ex' can not be defined in a type specifier}} +void g() throw (struct Ex {}) { // expected-error {{'Ex' cannot be defined in a type specifier}} } -alignas(struct Aa {}) int x; // expected-error {{'Aa' can not be defined in a type specifier}} +alignas(struct Aa {}) int x; // expected-error {{'Aa' cannot be defined in a type specifier}} -int a = sizeof(struct So {}); // expected-error {{'So' can not be defined in a type specifier}} -int b = alignof(struct Ao {}); // expected-error {{'Ao' can not be defined in a type specifier}} +int a = sizeof(struct So {}); // expected-error {{'So' cannot be defined in a type specifier}} +int b = alignof(struct Ao {}); // expected-error {{'Ao' cannot be defined in a type specifier}} namespace std { struct type_info; } -const std::type_info &ti = typeid(struct Ti {}); // expected-error {{'Ti' can not be defined in a type specifier}} +const std::type_info &ti = typeid(struct Ti {}); // expected-error {{'Ti' cannot be defined in a type specifier}} diff --git a/clang/test/CXX/dcl.decl/dcl.meaning/dcl.fct/p8.cpp b/clang/test/CXX/dcl.decl/dcl.meaning/dcl.fct/p8.cpp index ec1ccbf5de5..0454412229f 100644 --- a/clang/test/CXX/dcl.decl/dcl.meaning/dcl.fct/p8.cpp +++ b/clang/test/CXX/dcl.decl/dcl.meaning/dcl.fct/p8.cpp @@ -1,8 +1,8 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s struct A { }; -A::A (enum { e1 }) {} // expected-error{{can not be defined in a parameter}} -void A::f(enum { e2 }) {} // expected-error{{can not be defined in a parameter}} +A::A (enum { e1 }) {} // expected-error{{cannot be defined in a parameter}} +void A::f(enum { e2 }) {} // expected-error{{cannot be defined in a parameter}} -enum { e3 } A::g() { } // expected-error{{can not be defined in the result type}} \ +enum { e3 } A::g() { } // expected-error{{cannot be defined in the result type}} \ // expected-error{{out-of-line definition}} diff --git a/clang/test/CXX/drs/dr1xx.cpp b/clang/test/CXX/drs/dr1xx.cpp index 6a18b53fe05..6aff43c6a48 100644 --- a/clang/test/CXX/drs/dr1xx.cpp +++ b/clang/test/CXX/drs/dr1xx.cpp @@ -66,7 +66,7 @@ namespace dr108 { // dr108: yes namespace dr109 { // dr109: yes struct A { template<typename T> void f(T); }; template<typename T> struct B : T { - using T::template f; // expected-error {{using declaration can not refer to a template}} + using T::template f; // expected-error {{using declaration cannot refer to a template}} void g() { this->f<int>(123); } // expected-error {{use 'template'}} }; } @@ -722,9 +722,9 @@ namespace dr169 { // dr169: yes }; struct D : A<int>, B { using A<int>::n; - using B::C<int>; // expected-error {{using declaration can not refer to a template specialization}} - using B::f<int>; // expected-error {{using declaration can not refer to a template specialization}} - using B::n<int>; // expected-error {{using declaration can not refer to a template specialization}} + using B::C<int>; // expected-error {{using declaration cannot refer to a template specialization}} + using B::f<int>; // expected-error {{using declaration cannot refer to a template specialization}} + using B::n<int>; // expected-error {{using declaration cannot refer to a template specialization}} }; } diff --git a/clang/test/CXX/special/class.inhctor/elsewhere.cpp b/clang/test/CXX/special/class.inhctor/elsewhere.cpp index b986f658249..c042834b214 100644 --- a/clang/test/CXX/special/class.inhctor/elsewhere.cpp +++ b/clang/test/CXX/special/class.inhctor/elsewhere.cpp @@ -9,7 +9,7 @@ struct B1 { B1(int); }; -using B1::B1; // expected-error {{using declaration can not refer to class member}} +using B1::B1; // expected-error {{using declaration cannot refer to class member}} // C++11 [namespace.udecl]p10: // A using-declaration is a declaration and can therefore be used repeatedly @@ -27,7 +27,7 @@ struct I1 : B1 { // shall name a direct base class of the class being defined. struct D1 : I1 { - using B1::B1; // expected-error {{'B1' is not a direct base of 'D1', can not inherit constructors}} + using B1::B1; // expected-error {{'B1' is not a direct base of 'D1', cannot inherit constructors}} }; template<typename T> struct A {}; @@ -47,7 +47,7 @@ C<char> cc; // expected-note {{here}} template<typename T> struct D : A<T> {}; template<typename T> struct E : D<T> { - using A<bool>::A; // expected-error {{'A<bool>' is not a direct base of 'E<bool>', can not inherit}} + using A<bool>::A; // expected-error {{'A<bool>' is not a direct base of 'E<bool>', cannot inherit}} }; E<bool> eb; // expected-note {{here}} diff --git a/clang/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp b/clang/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp index a49db5166a4..2651f994209 100644 --- a/clang/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp +++ b/clang/test/CXX/temp/temp.decls/temp.class.spec/p8-1y.cpp @@ -21,10 +21,10 @@ template<template<typename> class...X> int v4<X...>; template<typename Outer> struct X { template<typename Inner> static int y; - template<typename Inner> static int y<Outer>; // expected-warning {{can not be deduced}} expected-note {{'Inner'}} + template<typename Inner> static int y<Outer>; // expected-warning {{cannot be deduced}} expected-note {{'Inner'}} template<typename Inner> static int y<Inner>; // expected-error {{does not specialize}} }; -template<typename Outer> template<typename Inner> int X<Outer>::y<Outer>; // expected-warning {{can not be deduced}} expected-note {{'Inner'}} +template<typename Outer> template<typename Inner> int X<Outer>::y<Outer>; // expected-warning {{cannot be deduced}} expected-note {{'Inner'}} template<typename Outer> template<typename Inner> int X<Outer>::y<Inner>; // expected-error {{does not specialize}} // FIXME: Merging this with the above class causes an assertion failure when diff --git a/clang/test/CXX/temp/temp.decls/temp.mem/p3.cpp b/clang/test/CXX/temp/temp.decls/temp.mem/p3.cpp index 0eb747be207..7e13f2a58ba 100644 --- a/clang/test/CXX/temp/temp.decls/temp.mem/p3.cpp +++ b/clang/test/CXX/temp/temp.decls/temp.mem/p3.cpp @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s template <class T> struct AA { - template <class C> virtual void g(C); // expected-error{{'virtual' can not be specified on member function templates}} + template <class C> virtual void g(C); // expected-error{{'virtual' cannot be specified on member function templates}} virtual void f(); }; diff --git a/clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.type/p9-0x.cpp b/clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.type/p9-0x.cpp index d7989e305f0..782057d397b 100644 --- a/clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.type/p9-0x.cpp +++ b/clang/test/CXX/temp/temp.fct.spec/temp.deduct/temp.deduct.type/p9-0x.cpp @@ -32,7 +32,7 @@ namespace PackExpansionNotAtEnd { template<typename ... Types, // expected-note{{non-deducible template parameter 'Types'}} typename Tail> // expected-note{{non-deducible template parameter 'Tail'}} - struct UselessPartialSpec<Types..., Tail>; // expected-warning{{class template partial specialization contains template parameters that can not be deduced; this partial specialization will never be used}} + struct UselessPartialSpec<Types..., Tail>; // expected-warning{{class template partial specialization contains template parameters that cannot be deduced; this partial specialization will never be used}} } namespace DeduceNonTypeTemplateArgsInArray { |
