decl.c: Rename all identifiers named `class' to `cl'.

	* decl.c: Rename all identifiers named `class' to `cl'.
	* cp-tree.h: Likewise.

From-SVN: r85151

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5fed73427cffb9905af94878aacd102c633a51a4..bbcd038f2ac75ca370d75c393cc4c9e094fe2e12 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-25  Bernardo Innocenti  <bernie@develer.com>
+
+       * decl.c: Rename all identifiers named `class' to `cl'.
+       * cp-tree.h: Likewise.
+
 2004-07-25  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
        * cp-tree.h (TYPE_SET_PTRMEMFUNC_TYPE): Use GGC_CNEW.

diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 28aed6ad2f5e3fbebd56242de312b8e6769a7174..bcbf793e27a509c161dcd5797f5635993e4664c2 100644 (file)
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -3744,8 +3744,10 @@ extern tree declare_global_var                  (tree, tree);
 extern void register_dtor_fn                    (tree);
 extern tmpl_spec_kind current_tmpl_spec_kind    (int);
 extern tree cp_fname_init                      (const char *, tree *);
-extern tree builtin_function (const char *, tree, int, enum built_in_class,
-                             const char *, tree);
+extern tree builtin_function (const char *name, tree type,
+                             int code,
+                             enum built_in_class cl,
+                             const char *libname, tree attrs);
 extern tree check_elaborated_type_specifier     (enum tag_types, tree, bool);
 extern void warn_extern_redeclared_static (tree, tree);
 extern bool cp_missing_noreturn_ok_p           (tree);

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 427d5c554f16d976b20b046b2031c6ec0642b53d..17b391bd49b614fe4648fe3a0f2fa2b967708932 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -67,8 +67,9 @@ static tree grokfndecl (tree, tree, tree, tree, tree, int,
 static tree grokvardecl (tree, tree, const cp_decl_specifier_seq *,
                         int, int, tree);
 static void record_unknown_type (tree, const char *);
-static tree builtin_function_1 (const char *, tree, tree, int,
-                                enum built_in_class, const char *,
+static tree builtin_function_1 (const char *, tree, tree,
+                               enum built_in_function code,
+                                enum built_in_class cl, const char *,
                                tree);
 static tree build_library_fn_1 (tree, enum tree_code, tree);
 static int member_function_or_else (tree, tree, enum overload_flags);
@@ -3162,7 +3163,7 @@ static tree
 builtin_function_1 (const char* name,
                     tree type,
                     tree context,
-                    int code,
+                   enum built_in_function code,
                     enum built_in_class class,
                     const char* libname,
                     tree attrs)
@@ -3214,7 +3215,7 @@ tree
 builtin_function (const char* name,
                   tree type,
                   int code,
-                  enum built_in_class class,
+                  enum built_in_class cl,
                   const char* libname,
                   tree attrs)
 {
@@ -3223,12 +3224,12 @@ builtin_function (const char* name,
   if (name[0] != '_')
     {
       push_namespace (std_identifier);
-      builtin_function_1 (name, type, std_node, code, class, libname, attrs);
+      builtin_function_1 (name, type, std_node, code, cl, libname, attrs);
       pop_namespace ();
     }
 
   return builtin_function_1 (name, type, NULL_TREE, code,
-                            class, libname, attrs);
+                            cl, libname, attrs);
 }
 
 /* Generate a FUNCTION_DECL with the typical flags for a runtime library