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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 984d5de61542a297d564cfc42975ac768ed752ec..c0b57257caa06317dd3a0a3b90ba80f66cc435bc 100644 (file)
--- 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 ca9a3ca27ab5635d49c2d90a6d3c96141a1a8f6a..a70ab61ff63cb545c0c8eb03b3351d6d50e89f11 100644 (file)
--- 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);