Fix up whitespacing

[pf3gnuchains/gcc-fork.git] / gcc / cp / name-lookup.h

diff --git a/gcc/cp/name-lookup.h b/gcc/cp/name-lookup.h
index 70c12a2..0d99f9b 100644 (file)
--- a/gcc/cp/name-lookup.h
+++ b/gcc/cp/name-lookup.h
@@ -16,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 #ifndef GCC_CP_NAME_LOOKUP_H
 #define GCC_CP_NAME_LOOKUP_H
@@ -40,11 +40,11 @@ struct binding_entry_s GTY(())
 };
 
 /* These macros indicate the initial chains count for binding_table.  */
-#define SCOPE_DEFAULT_HT_SIZE                        (1 << 3)
-#define CLASS_SCOPE_HT_SIZE                          (1 << 3)
-#define NAMESPACE_ORDINARY_HT_SIZE                   (1 << 5)
-#define NAMESPACE_STD_HT_SIZE                        (1 << 8)
-#define GLOBAL_SCOPE_HT_SIZE                         (1 << 8)
+#define SCOPE_DEFAULT_HT_SIZE          (1 << 3)
+#define CLASS_SCOPE_HT_SIZE            (1 << 3)
+#define NAMESPACE_ORDINARY_HT_SIZE     (1 << 5)
+#define NAMESPACE_STD_HT_SIZE          (1 << 8)
+#define GLOBAL_SCOPE_HT_SIZE           (1 << 8)
 
 extern void binding_table_foreach (binding_table, bt_foreach_proc, void *);
 extern binding_entry binding_table_find (binding_table, tree);
@@ -105,22 +105,23 @@ typedef enum scope_kind {
                        is initialized by using "memset" to set the
                        contents to zero, and the default scope kind
                        is "sk_block".  */
-  sk_cleanup,        /* A scope for (pseudo-)scope for cleanup.  It is
-                        peusdo in that it is transparent to name lookup
-                        activities.  */
+  sk_cleanup,       /* A scope for (pseudo-)scope for cleanup.  It is
+                       pseudo in that it is transparent to name lookup
+                       activities.  */
   sk_try,           /* A try-block.  */
-  sk_catch,          /* A catch-block.  */
-  sk_for,            /* The scope of the variable declared in a
+  sk_catch,         /* A catch-block.  */
+  sk_for,           /* The scope of the variable declared in a
                        for-init-statement.  */
   sk_function_parms, /* The scope containing function parameters.  */
-  sk_class,          /* The scope containing the members of a class.  */
-  sk_namespace,      /* The scope containing the members of a
+  sk_class,         /* The scope containing the members of a class.  */
+  sk_namespace,             /* The scope containing the members of a
                        namespace, including the global scope.  */
   sk_template_parms, /* A scope for template parameters.  */
-  sk_template_spec   /* Like sk_template_parms, but for an explicit
+  sk_template_spec,  /* Like sk_template_parms, but for an explicit
                        specialization.  Since, by definition, an
                        explicit specialization is introduced by
                        "template <>", this scope is always empty.  */
+  sk_omp            /* An OpenMP structured block.  */
 } scope_kind;
 
 /* The scope where the class/struct/union/enum tag applies.  */
@@ -191,7 +192,7 @@ struct cp_binding_level GTY(())
     VEC(tree,gc) *static_decls;
 
     /* A chain of VTABLE_DECL nodes.  */
-    tree vtables; 
+    tree vtables;
 
     /* A list of USING_DECL nodes.  */
     tree usings;
@@ -258,7 +259,11 @@ struct cp_binding_level GTY(())
     unsigned more_cleanups_ok : 1;
     unsigned have_cleanups : 1;
 
-    /* 22 bits left to fill a 32-bit word.  */
+    /* Nonzero if this level has associated visibility which we should pop
+       when leaving the scope. */
+    unsigned has_visibility : 1;
+
+    /* 23 bits left to fill a 32-bit word.  */
   };
 
 /* The binding level currently in effect.  */
@@ -306,25 +311,26 @@ extern void pop_inner_scope (tree, tree);
 extern void push_binding_level (struct cp_binding_level *);
 \f
 extern void push_namespace (tree);
+extern void push_namespace_with_attribs (tree, tree);
 extern void pop_namespace (void);
 extern void push_nested_namespace (tree);
 extern void pop_nested_namespace (tree);
 extern void pushlevel_class (void);
 extern void poplevel_class (void);
-extern tree pushdecl_with_scope (tree, cxx_scope *);
-extern tree lookup_name        (tree, int);
+extern tree pushdecl_with_scope (tree, cxx_scope *, bool);
+extern tree lookup_name_prefer_type (tree, int);
 extern tree lookup_name_real (tree, int, int, bool, int, int);
 extern tree lookup_type_scope (tree, tag_scope);
 extern tree namespace_binding (tree, tree);
 extern void set_namespace_binding (tree, tree, tree);
 extern bool hidden_name_p (tree);
-extern tree lookup_namespace_name (tree, tree);
+extern tree remove_hidden_names (tree);
 extern tree lookup_qualified_name (tree, tree, bool, bool);
 extern tree lookup_name_nonclass (tree);
 extern tree lookup_function_nonclass (tree, tree, bool);
 extern void push_local_binding (tree, tree, int);
 extern bool pushdecl_class_level (tree);
-extern tree pushdecl_namespace_level (tree);
+extern tree pushdecl_namespace_level (tree, bool);
 extern bool push_class_level_binding (tree, tree);
 extern tree getdecls (void);
 extern tree cp_namespace_decls (tree);