diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 2004-04-14 15:46:35 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2004-04-14 15:46:35 -0400 |
| commit | 8329559d9e2495bd980454f28edbcb7d3188691a (patch) | |
| tree | a62262f262b80c7f93c0e9b7c1abb441b3bc2527 /gcc | |
| parent | aeb95628f30fdee73f46a1a71362631783fb1c92 (diff) | |
| download | gcc-8329559d9e2495bd980454f28edbcb7d3188691a.zip gcc-8329559d9e2495bd980454f28edbcb7d3188691a.tar.gz gcc-8329559d9e2495bd980454f28edbcb7d3188691a.tar.bz2 | |
revert: re PR c++/13294 (namespace associations vs. specializations)
Revert:
PR c++/13294
* pt.c (maybe_process_partial_specialization): Remember the
context of a specialization.
From-SVN: r80689
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 10 |
2 files changed, 1 insertions, 15 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 984d5de..c0b5725 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -96,12 +96,6 @@ * error.c (dump_function_name): If T's DECL_LANG_SPECIFIC is null, just print the literal name and return. -2004-03-25 Jason Merrill <jason@redhat.com> - - PR c++/13294 - * pt.c (maybe_process_partial_specialization): Remember the - context of a specialization. - 2004-03-25 Kazu Hirata <kazu@cs.umass.edu> * cxx-pretty-print.c: Fix comment typos. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index ca9a3ca..a70ab61 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -733,15 +733,7 @@ maybe_process_partial_specialization (tree type) { tree tpl_ns = decl_namespace_context (CLASSTYPE_TI_TEMPLATE (type)); if (is_associated_namespace (current_namespace, tpl_ns)) - /* Same or super-using namespace. */ - { - if (DECL_NAMESPACE_SCOPE_P (CLASSTYPE_TI_TEMPLATE (type))) - /* If this is a specialization of a namespace-scope class - template, remember the context of the - specialization. */ - TYPE_CONTEXT (type) = DECL_CONTEXT (TYPE_NAME (type)) - = FROB_CONTEXT (current_namespace); - } + /* Same or super-using namespace. */; else { pedwarn ("specializing `%#T' in different namespace", type); |