diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-04-13 04:07:40 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-04-13 04:07:40 +0000 |
| commit | a1c4f7c833093f87d5187c4449a3d4534cfa40a4 (patch) | |
| tree | 31ca867f759b210876a2da1893cff1528b92a3bf /test/CXX | |
| parent | 5e6c3f0397254e2a1a9ef85cf13232f89e653640 (diff) | |
PR12500: Improve the wording of the diagnostic for a redefinition of a name
in the wrong namespace scope. Patch by Jonathan Sauer!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@154656 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/CXX')
| -rw-r--r-- | test/CXX/temp/temp.spec/temp.expl.spec/p2-0x.cpp | 6 | ||||
| -rw-r--r-- | test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/CXX/temp/temp.spec/temp.expl.spec/p2-0x.cpp b/test/CXX/temp/temp.spec/temp.expl.spec/p2-0x.cpp index acfbb46447..b0a19fb93a 100644 --- a/test/CXX/temp/temp.spec/temp.expl.spec/p2-0x.cpp +++ b/test/CXX/temp/temp.spec/temp.expl.spec/p2-0x.cpp @@ -33,7 +33,7 @@ namespace N0 { template<> void N0::f0(int) { } // okay namespace N1 { - template<> void N0::f0(long) { } // expected-error{{not in a namespace enclosing}} + template<> void N0::f0(long) { } // expected-error{{does not enclose namespace}} } template<> void N0::f0(double) { } @@ -129,7 +129,7 @@ template<> int N0::X0<int>::member; template<> float N0::X0<float>::member = 3.14f; namespace N1 { - template<> double N0::X0<double>::member = 3.14; // expected-error{{not in a namespace enclosing}} + template<> double N0::X0<double>::member = 3.14; // expected-error{{does not enclose namespace}} } // -- member class of a class template @@ -227,7 +227,7 @@ void N0::X0<void*>::ft1(void *, float) { } namespace N1 { template<> template<> - void N0::X0<void*>::ft1(void *, long) { } // expected-error{{enclosing}} + void N0::X0<void*>::ft1(void *, long) { } // expected-error{{does not enclose namespace}} } diff --git a/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp b/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp index dff7cd5b40..c972bf7c7d 100644 --- a/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp +++ b/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp @@ -33,7 +33,7 @@ namespace N0 { template<> void N0::f0(int) { } // okay namespace N1 { - template<> void N0::f0(long) { } // expected-error{{not in a namespace enclosing}} + template<> void N0::f0(long) { } // expected-error{{does not enclose namespace}} } template<> void N0::f0(double); // expected-warning{{C++11 extension}} @@ -130,7 +130,7 @@ template<> int N0::X0<int>::member; // expected-warning{{C++11 extension}} template<> float N0::X0<float>::member = 3.14f; namespace N1 { - template<> double N0::X0<double>::member = 3.14; // expected-error{{not in a namespace enclosing}} + template<> double N0::X0<double>::member = 3.14; // expected-error{{does not enclose namespace}} } // -- member class of a class template @@ -228,7 +228,7 @@ void N0::X0<void*>::ft1(void *, float) { } // expected-warning{{function templat namespace N1 { template<> template<> - void N0::X0<void*>::ft1(void *, long) { } // expected-error{{enclosing}} + void N0::X0<void*>::ft1(void *, long) { } // expected-error{{does not enclose namespace}} } |