aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c5
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/template/operator4.C11
4 files changed, 25 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1a97cca..0ba2415 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-18 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/17068
+ * pt.c (dependent_template_p): Treat IDENTIFIER_NODEs as
+ dependent.
+
2004-08-17 Mark Mitchell <mark@codesourcery.com>
PR c++/16246
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 257f106..5175eb1 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -12033,8 +12033,9 @@ dependent_template_p (tree tmpl)
if (DECL_TEMPLATE_TEMPLATE_PARM_P (tmpl)
|| TREE_CODE (tmpl) == TEMPLATE_TEMPLATE_PARM)
return true;
- /* So are qualified names that have not been looked up. */
- if (TREE_CODE (tmpl) == SCOPE_REF)
+ /* So arenames that have not been looked up. */
+ if (TREE_CODE (tmpl) == SCOPE_REF
+ || TREE_CODE (tmpl) == IDENTIFIER_NODE)
return true;
/* So are member templates of dependent classes. */
if (TYPE_P (CP_DECL_CONTEXT (tmpl)))
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 78cd8df..c95d844 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-18 Mark Mitchell <mark@codesourcery.com>
+
+ PR c++/17068
+ * g++.dg/template/operator4.C: New test.
+
2004-08-18 Richard Henderson <rth@redhat.com>
* gcc.dg/20040206-1.c: XFAIL.
diff --git a/gcc/testsuite/g++.dg/template/operator4.C b/gcc/testsuite/g++.dg/template/operator4.C
new file mode 100644
index 0000000..972d52f
--- /dev/null
+++ b/gcc/testsuite/g++.dg/template/operator4.C
@@ -0,0 +1,11 @@
+// PR c++/17068
+
+struct A
+{
+ template<int> void operator()() {}
+};
+
+template<typename> void foo()
+{
+ A().template operator()<0>();
+}