aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2009-10-08 15:27:05 +0000
committerDouglas Gregor <dgregor@apple.com>2009-10-08 15:27:05 +0000
commit42887b9224e1d47372fb8a00cba27c925924fa52 (patch)
treebac1ee2ef260d4ccb798055d52d33d243a0f81de
parentf6b1185f0a8a209c06dfc1efdb6a59cc851e970c (diff)
More testing for explicit specializations of member class templates
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@83548 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp40
1 files changed, 33 insertions, 7 deletions
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 0ba95d875a..9c6c5edc50 100644
--- a/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp
+++ b/test/CXX/temp/temp.spec/temp.expl.spec/p2.cpp
@@ -58,7 +58,8 @@ struct X0 { // expected-note 2{{here}}
struct Inner : public T { }; // expected-note 3{{here}}
template<typename U>
- struct InnerTemplate : public T { };
+ struct InnerTemplate : public T { }; // expected-note 2{{explicitly specialized}} \
+ // expected-error{{base specifier}}
template<typename U>
void ft1(T t, U u);
@@ -170,15 +171,40 @@ N0::X0<long>::Inner inner2;
N0::X0<float>::Inner inner3;
N0::X0<double>::Inner inner4; // expected-error{{incomplete}}
-#if 0
-// FIXME: update the remainder of this test to check for scopes properly.
// -- member class template of a class template
-template<>
-template<>
-struct X0<void*>::InnerTemplate<int> { };
+namespace N0 {
+ template<>
+ template<>
+ struct X0<void*>::InnerTemplate<int> { };
+
+ template<> template<>
+ struct X0<int>::InnerTemplate<int>; // expected-note{{forward declaration}}
+
+ template<> template<>
+ struct X0<int>::InnerTemplate<long>;
-X0<void*>::InnerTemplate<int> inner_template0;
+ template<> template<>
+ struct X0<int>::InnerTemplate<double>;
+}
+
+template<> template<>
+struct N0::X0<int>::InnerTemplate<long> { }; // okay
+
+template<> template<>
+struct N0::X0<int>::InnerTemplate<float> { }; // expected-error{{class template specialization}}
+namespace N1 {
+ template<> template<>
+ struct N0::X0<int>::InnerTemplate<double> { }; // expected-error{{enclosing}}
+}
+
+N0::X0<void*>::InnerTemplate<int> inner_template0;
+N0::X0<int>::InnerTemplate<int> inner_template1; // expected-error{{incomplete}}
+N0::X0<int>::InnerTemplate<long> inner_template2;
+N0::X0<int>::InnerTemplate<unsigned long> inner_template3; // expected-note{{instantiation}}
+
+#if 0
+// FIXME: update the remainder of this test to check for scopes properly.
// -- member function template of a class template
template<>
template<>