summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2004-04-14 19:45:16 +0000
committerjason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>2004-04-14 19:45:16 +0000
commit3403eab1c41e44c641f8f40b471a3ba4505ec012 (patch)
tree173de27ded1ad9aaef097c411f9c8f87867d3c11
parent623fb6663854f73b88fa43eeacaf43ae5b293a8a (diff)
downloadgcc-3403eab1c41e44c641f8f40b471a3ba4505ec012.tar.gz
Revert:
PR c++/13294 * pt.c (maybe_process_partial_specialization): Remember the context of a specialization. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-3_4-branch@80687 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/pt.c10
2 files changed, 1 insertions, 15 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 3d6f29a64e5..b3de07cf202 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -28,12 +28,6 @@
PR c++/14810
* name-lookup.c (maybe_push_cleanup_level): Robustify.
-2004-03-30 Jason Merrill <jason@redhat.com>
-
- PR c++/13294
- * pt.c (maybe_process_partial_specialization): Remember the
- context of a specialization.
-
2004-03-30 Mark Mitchell <mark@codesourcery.com>
PR c++/14724
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 1aaea9276d7..2e761469ec3 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);