diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-01 03:16:16 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-01 03:16:16 +0000 |
| commit | 6fc758aa3cf3d81daf2ba2a7f2559f4613302a03 (patch) | |
| tree | 3066b97ea36670263a737d3fe7ba2294700eb811 /gcc/cp/cp-tree.h | |
| parent | 77abcf16b7afe74f38a3179d33bc21355eaf4bbc (diff) | |
| download | gcc-6fc758aa3cf3d81daf2ba2a7f2559f4613302a03.tar.gz | |
* cp-tree.h (LOOKUP_TEMPLATES_EXPECTED): Remove.
(lookup_name_namespace_only): Likewise.
(begin_only_namespace_names): Likewise.
(end_only_namespace_names): Likewise.
* decl.c (only_namespace_names): Remove.
(qualify_lookup): Do not check LOOKUP_TEMPLATES_EXPECTED.
(lookup_name_real): Do not check only_namespace_names.
(lookup_name_namespace_only): Remove.
(begin_only_namespace_names): Likewise.
(end_only_namespace_names): Likewise.
* parser.c (cp_parser_nested_name_specifier_opt): Handle erroneous
nested-name-specifiers more gracefully.
(cp_parser_class_or_namespace_name): Avoid looking up namespace
names when they cannot possibly appear.
(cp_parser_template_name): Adjust call to cp_parser_lookup_name.
(cp_parser_elaborated_type_specifier): Likewise.
(cp_parser_namespace_name): Only look for namespace names.
(cp_parser_lookup_name): Add is_namespace parameter.
(cp_parser_lookup_name_simple): Adjust call to
cp_parser_lookup_name.
* g++.dg/parse/namespace1.C: New test.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60729 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cp-tree.h')
| -rw-r--r-- | gcc/cp/cp-tree.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index e27c66832ea..76197675713 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -3385,9 +3385,7 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG }; LOOKUP_PREFER_TYPES means not to accept objects, and possibly namespaces. LOOKUP_PREFER_NAMESPACES means not to accept objects, and possibly types. - LOOKUP_PREFER_BOTH means class-or-namespace-name. - LOOKUP_TEMPLATES_EXPECTED means that class templates also count - as types. */ + LOOKUP_PREFER_BOTH means class-or-namespace-name. */ #define LOOKUP_PROTECT (1) #define LOOKUP_COMPLAIN (2) @@ -3403,7 +3401,6 @@ enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG }; #define LOOKUP_PREFER_TYPES (2048) #define LOOKUP_PREFER_NAMESPACES (4096) #define LOOKUP_PREFER_BOTH (6144) -#define LOOKUP_TEMPLATES_EXPECTED (8192) #define LOOKUP_NAMESPACES_ONLY(F) \ (((F) & LOOKUP_PREFER_NAMESPACES) && !((F) & LOOKUP_PREFER_TYPES)) @@ -3738,10 +3735,7 @@ extern tree lookup_qualified_name (tree, tree, bool, int); extern tree lookup_name PARAMS ((tree, int)); extern tree lookup_name_current_level PARAMS ((tree)); extern tree lookup_type_current_level PARAMS ((tree)); -extern tree lookup_name_namespace_only PARAMS ((tree)); extern tree lookup_name_real (tree, int, int, int, int); -extern void begin_only_namespace_names PARAMS ((void)); -extern void end_only_namespace_names PARAMS ((void)); extern tree namespace_ancestor PARAMS ((tree, tree)); extern tree unqualified_namespace_lookup PARAMS ((tree, int, tree *)); extern tree check_for_out_of_scope_variable (tree); |