Changeset 119 for trunk/ORBit2-2.14.0

Timestamp:

Nov 26, 2006, 7:19:48 PM (19 years ago)

Author:

cinc

Message:

Eliminated redefinition warning for inherited methods.

File:

• trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-headers.c (modified) (2 diffs)

trunk/ORBit2-2.14.0/src/idl-compiler/orbit-idl-c-headers.c

@@ -1339 +1339 @@
       if(!strstr(IDL_IDENT (IDL_OP_DCL (curop).ident).str, "__OVERRIDE__"))
         {
+          fprintf(ioi->of, "#if 0 /* %s, %s line %d */\n", __FILE__, __FUNCTION__, __LINE__);
           fprintf(ioi->of, "#define %s_%s %s_%s\n",
                   realid, IDL_IDENT(IDL_OP_DCL(curop).ident).str,
                   id, IDL_IDENT(IDL_OP_DCL(curop).ident).str);
+          fprintf(ioi->of, "#endif\n");
         }
       break;
@@ -1348 +1350 @@
     case IDLN_ATTR_DCL:
       {
-        IDL_tree curitem;
-
-        /* We don't use OIDL_Attr_Info here because inherited ops may go back into trees that are output-inhibited
-           and therefore don't have the OIDL_Attr_Info generated on them */
-
-        for(curitem = IDL_ATTR_DCL(curop).simple_declarations; curitem; curitem = IDL_LIST(curitem).next) {
-          IDL_tree ident;
-
-          ident = IDL_LIST(curitem).data;
-          
-          fprintf(ioi->of, "#define %s__get_%s %s__get_%s\n",
-                  realid, IDL_IDENT(ident).str,
-                  id, IDL_IDENT(ident).str);
-
-          if(!IDL_ATTR_DCL(curop).f_readonly)
-            fprintf(ioi->of, "#define %s__set_%s %s__set_%s\n",
-                    realid, IDL_IDENT(ident).str,
-                    id, IDL_IDENT(ident).str);
-        }
+        IDL_tree curitem;
+        
+        /* We don't use OIDL_Attr_Info here because inherited ops may go back into trees that are output-inhibited
+           and therefore don't have the OIDL_Attr_Info generated on them */
+        
+        for(curitem = IDL_ATTR_DCL(curop).simple_declarations; curitem; curitem = IDL_LIST(curitem).next) {
+          IDL_tree ident;
+          
+          ident = IDL_LIST(curitem).data;
+          
+          fprintf(ioi->of, "#define %s__get_%s %s__get_%s\n",
+                  realid, IDL_IDENT(ident).str,
+                  id, IDL_IDENT(ident).str);
+          
+          if(!IDL_ATTR_DCL(curop).f_readonly)
+            fprintf(ioi->of, "#define %s__set_%s %s__set_%s\n",
+                    realid, IDL_IDENT(ident).str,
+                    id, IDL_IDENT(ident).str);
+        }/* for() */
       }
       break;