Changeset 371 for trunk/idl-compiler

Timestamp:

Jun 28, 2008, 12:27:00 PM (17 years ago)

Author:

cinc

Message:

Make sure method macros are not silently redefined.

File:

• trunk/idl-compiler/h-emitter_c/h_file_emitter.c (modified) (4 diffs)

trunk/idl-compiler/h-emitter_c/h_file_emitter.c

@@ -205 +205 @@
       emitMethodParams(pLocalPI, pif, pm->pParamArray);
       fprintf(fh, "    CORBA_Environment *ev);\n");
+
+      /* Macro to be used when several parameters are checked */
       fprintf(fh, "#error The macro is broken. It does not support ˚recursive˚ calls (Line: %d)\n", __LINE__);
-      /* Macro to be used when several parameters are checked */
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
       /* Do parameters */
@@ -234 +235 @@
         }
       fprintf(fh, "#else /* Extended parameter check */\n"); /* else NOM_NO_PARAM_CHECK */
+
       /* Check object only  */
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
@@ -266 +268 @@
       fprintf(fh, "#endif\n");
       fprintf(fh, "#else /* NOM_NO_PARAM_CHECK */\n");
+      /* Standard macro without parameter check */
       fprintf(fh, "#define %s_%s(nomSelf,", pif->chrName, pm->chrName);
       /* Do parameters */
@@ -276 +279 @@
       fprintf(fh, " ev))\n");
       fprintf(fh, "#endif\n");
+
+      fprintf(fh, "#ifdef _%s\n", pm->chrName);
+      fprintf(fh, "#undef _%s\n", pm->chrName);      
+      fprintf(fh, "#else\n");
       fprintf(fh, "#define _%s %s_%s\n", pm->chrName, pif->chrName, pm->chrName);
+      fprintf(fh, "#endif\n");
+
       fprintf(fh, "#endif /* _decl_%s_%s_ */ \n\n", pif->chrName,  pm->chrName);
     }