* arith.c (eval_type_intrinsic0): Avoid C++ keywords.

	* gfortran.h (try, protected, operator, new): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137960 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5febef3..845dcf7 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-18  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * arith.c (eval_type_intrinsic0): Avoid C++ keywords.
+       * gfortran.h (try, protected, operator, new): Likewise.
+
 2008-07-17  Tobias Burnus  <burnus@net-b.de>
 
        PR fortran/36825

diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c
index bd32145..ca6de63 100644 (file)
--- a/gcc/fortran/arith.c
+++ b/gcc/fortran/arith.c
@@ -1739,12 +1739,12 @@ runtime:
 /* Modify type of expression for zero size array.  */
 
 static gfc_expr *
-eval_type_intrinsic0 (gfc_intrinsic_op operator, gfc_expr *op)
+eval_type_intrinsic0 (gfc_intrinsic_op iop, gfc_expr *op)
 {
   if (op == NULL)
     gfc_internal_error ("eval_type_intrinsic0(): op NULL");
 
-  switch (operator)
+  switch (iop)
     {
     case INTRINSIC_GE:
     case INTRINSIC_GE_OS:

diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h
index aa2296c..5c6fd92 100644 (file)
--- a/gcc/fortran/gfortran.h
+++ b/gcc/fortran/gfortran.h
@@ -114,9 +114,11 @@ io_kind;
    following enum makes things much more readable.  We also start
    values off at one instead of zero.  */
 
+/* FIXME: This macro is temporary until we convert everything.  */
+#define try gfc_try
 typedef enum
 { SUCCESS = 1, FAILURE }
-try;
+gfc_try;
 
 /* This is returned by gfc_notification_std to know if, given the flags
    that were given (-std=, -pedantic) we should issue an error, a warning
@@ -625,7 +627,9 @@ typedef struct
   ENUM_BITFIELD (save_state) save:2;
 
   unsigned data:1,             /* Symbol is named in a DATA statement.  */
-    protected:1,               /* Symbol has been marked as protected.  */
+    /* FIXME: This macro is temporary until we convert everything.  */
+#define protected is_protected
+    is_protected:1,            /* Symbol has been marked as protected.  */
     use_assoc:1,               /* Symbol has been use-associated.  */
     use_only:1,                        /* Symbol has been use-associated, with ONLY.  */
     use_rename:1,              /* Symbol has been use-associated and renamed.  */
@@ -980,13 +984,14 @@ gfc_interface;
 
 #define gfc_get_interface() XCNEW (gfc_interface)
 
-
+/* FIXME: This macro is temporary until we convert everything.  */
+#define operator op
 /* User operator nodes.  These are like stripped down symbols.  */
 typedef struct
 {
   const char *name;
 
-  gfc_interface *operator;
+  gfc_interface *op;
   struct gfc_namespace *ns;
   gfc_access access;
 }
@@ -1052,7 +1057,9 @@ typedef struct gfc_symbol
      the old symbol.  */
 
   struct gfc_symbol *old_symbol, *tlink;
-  unsigned mark:1, new:1;
+  /* FIXME: This macro is temporary until we convert everything.  */
+#define new gfc_new
+  unsigned mark:1, gfc_new:1;
   /* Nonzero if all equivalences associated with this symbol have been
      processed.  */
   unsigned equiv_built:1;