diff options
| author | Jason Merrill <jason@gcc.gnu.org> | 1998-06-24 23:28:35 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 1998-06-24 23:28:35 -0400 |
| commit | cb0dbb9a01a4a3c2c2a5a94601b72c2c63cc2a51 (patch) | |
| tree | 9200dfe8e80bc424f27eb57bd93f73389e249e39 /gcc/cp/Makefile.in | |
| parent | acd9204960d4417b564e75ce036618359ce5eeda (diff) | |
| download | gcc-cb0dbb9a01a4a3c2c2a5a94601b72c2c63cc2a51.zip gcc-cb0dbb9a01a4a3c2c2a5a94601b72c2c63cc2a51.tar.gz gcc-cb0dbb9a01a4a3c2c2a5a94601b72c2c63cc2a51.tar.bz2 | |
cp-tree.h (CP_DECL_CONTEXT): New macro.
* cp-tree.h (CP_DECL_CONTEXT): New macro.
* decl2.c (is_namespace_ancestor, lookup_using_namespace): Use it.
* method.c (build_overload_nested_name): Likewise.
* sig.c (build_signature_pointer_or_reference_type): Don't set
DECL_CONTEXT.
Set DECL_CONTEXT for globals to NULL_TREE instead of global_namespace.
* cp-tree.h (FROB_CONTEXT): New macro.
(DECL_MAIN_P): ::main should have a DECL_CONTEXT of NULL_TREE.
* decl.c (namespace_binding): Replace NULL_TREE with
global_namespace.
(set_namespace_binding, pop_namespace, lookup_name_real): Likewise.
* decl2.c (is_namespace_ancestor, lookup_using_namespace):
Likewise.
* decl.c (pushtag): Use FROB_CONTEXT.
(pushdecl, make_typename_type, define_function, grokdeclarator):
Likewise.
* decl2.c (set_decl_namespace, do_namespace_alias): Likewise.
* pt.c (push_template_decl_real, lookup_template_class, tsubst):
Likewise.
* decl2.c (decl_namespace): Return global_namespace if no context.
* method.c (build_overload_nested_name): Expect null as context.
* pt.c (mangle_class_name_for_template): Do nothing for null
contexts.
(lookup_template_class): Allow for null id_context.
From-SVN: r20710
Diffstat (limited to 'gcc/cp/Makefile.in')
| -rw-r--r-- | gcc/cp/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 4b44500..34048a7 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -214,7 +214,7 @@ parse.o : $(PARSE_C) $(CONFIG_H) $(CXX_TREE_H) $(srcdir)/../flags.h lex.h \ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(BIG_SWITCHFLAG) \ `echo $(PARSE_C) | sed 's,^\./,,'` -CONFLICTS = expect 21 shift/reduce conflicts and 39 reduce/reduce conflicts. +CONFLICTS = expect 21 shift/reduce conflicts and 42 reduce/reduce conflicts. $(PARSE_H) : $(PARSE_C) $(PARSE_C) : $(srcdir)/parse.y @echo $(CONFLICTS) |