* cp/decl.c (xref_tag): Remove undefined macro NONNESTED_CLASSES.

From-SVN: r67592

2 files changed, 13 insertions, 14 deletions

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5910931..ad74fd5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-07  Andreas Jaeger  <aj@suse.de>
+
+	* cp/decl.c (xref_tag): Remove undefined macro NONNESTED_CLASSES.
+
 2003-06-07  Neil Booth  <neil@daikokuya.co.uk>
 
 	* cp-lang.c (LANG_HOOKS_DECODE_OPTON): Drop.
@@ -58,7 +62,7 @@ Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	(make_binding_level): Remove.
 	(initial_push__namespace_scope): New function.
 	(push_namespace): Use it.  Simplify.
-	(cxx_init_decl_processing): Likewise. 
+	(cxx_init_decl_processing): Likewise.
 	(declare_namespace_level): Remove.
 
 2003-05-31  Kriang Lerdsuwanakij  <lerdsuwa@users.sourceforge.net>
@@ -73,7 +77,7 @@ Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	(binding_depth): Unconditionally define.
 	(is_class_level): Likewise.
 	(indent): Likewise.  Take an indenting parameter.
-	(push_binding_level): Remove conditional definittion. 
+	(push_binding_level): Remove conditional definittion.
 	(pop_binding_level): Likewise.
 	(suspend_binding_level): Likewise.
 	(resume_binding_level): Likewise.
@@ -86,7 +90,7 @@ Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 
 	* name-lookup.h (global_scope_p): New macro.
 	* decl.c (pop_binding_level): Use it.  Don't refer directly to
-	global_binding_level. 
+	global_binding_level.
 	(suspend_binding_level): Likewise.
 	(global_bindings_p): Likewise.
 	(print_other_binding_stack): Likewise.
@@ -143,7 +147,7 @@ Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	* lang-options.h: Document -Wno-invalid-offsetof
 	* typeck.c (build_class_member_access_expr): Don't complain about
 	(Foo *)p->x for non-POD Foo if warn_invalid_offset is zero.
-	
+
 2003-05-18 Andrew Pinski <pinskia@physics.uc.edu>
 
 	* name-lookup.c (free_binding_entry): fix where the GTY markers are.
@@ -151,17 +155,17 @@ Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	fix the spelling of chain in a comment.
 	(binding_table_free): speed up by having temporary variable.
 	(binding_table_new): set table->chain to be NULL after allocating
-	a table. 
+	a table.
 	(cxx_binding_make): use gcc_alloc instead of ggc_alloc_cleared and set
 	binding->previous to NULL after getting an binding for speed.
-	
+
 2003-05-18  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* cp-tree.h (struct lang_type_class): Replace data member tags
 	with hash-table nested_udts.
 	(CLASSTYPE_NESTED_UTDS): Rename from CLASSTYPE_TAGS.
 	* class.c (unreverse_member_declarations): Don't touch
-	CLASSTYPE_TAGS. 
+	CLASSTYPE_TAGS.
 	(pushclass): Use cxx_remember_type_decls.
 	* decl.c (struct cp_binding_level): Replace data member tags with
 	hash-table type_decls.
@@ -234,13 +238,13 @@ Thu Jun  5 18:33:40 CEST 2003  Jan Hubicka  <jh@suse.cz>
 	* ptree.c (cxx_print_type, cxx_print_xnode): Use string
 	concatentation on HOST_WIDE_INT_PRINT_* format specifier to
 	collapse multiple function calls into one.
-	* tree.c (debug_binfo): Likewise.	
+	* tree.c (debug_binfo): Likewise.
 
 2003-05-15  Jason Merrill  <jason@redhat.com>
 
 	PR c++/5388
 	* call.c (conditional_conversion): Don't consider implicit
-	conversions if T2 is a base of T1. 
+	conversions if T2 is a base of T1.
 	* cp-tree.h (DERIVED_FROM_P, UNIQUELY_DERIVED_FROM_P): Make boolean.
 	(ACCESSIBLY_UNIQUELY_DERIVED_P, PUBLICLY_UNIQUELY_DERIVED_P): Likewise.
 
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index d269140..1807d05 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -12757,11 +12757,6 @@ xref_tag (enum tag_types tag_code, tree name, tree attributes,
 
 	  ref = make_aggr_type (code);
 	  TYPE_CONTEXT (ref) = context;
-
-#ifdef NONNESTED_CLASSES
-	  /* Class types don't nest the way enums do.  */
-	  class_binding_level = (struct cp_binding_level *)0;
-#endif
 	  pushtag (name, ref, globalize);
 	  class_binding_level = old_b;
 	}