Changeset 124 for trunk/ORBit2-2.14.0/src/idl-compiler

Timestamp:

Nov 28, 2006, 10:10:40 PM (19 years ago)

Author:

cinc

Message:

Back out patch for method redifinition warning and apply a (hopefully) better one.

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

@@ -1292 +1292 @@
                 fprintf(ci->fh, "/* OVERRIDE_METHOD: ");
                 fprintf(ci->fh, "%s %s */\n", IDL_IDENT (IDL_OP_DCL (cur).ident).str, id );
+                fprintf(ci->fh, "#ifdef %s_%s\n", id, IDL_IDENT (IDL_OP_DCL (cur).ident).str);
+                fprintf(ci->fh, "#undef %s_%s\n", id, IDL_IDENT (IDL_OP_DCL (cur).ident).str);
+                fprintf(ci->fh, "#endif\n");
                 /* Try to find the interface introducing this method */
 
@@ -1342 +1345 @@
       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, "/* %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;