Changeset 205 for trunk/ORBit2-2.14.0/src

Timestamp:

Jan 20, 2007, 3:26:14 PM (19 years ago)

Author:

cinc

Message:

No more warnings for wrong nomSelf parameter type

Location:

trunk/ORBit2-2.14.0/src/idl-compiler

Files:

• orbit-idl-c-headers.c (modified) (2 diffs)
• orbit-idl-c-skelimpl.c (modified) (1 diff)

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

@@ -379 +379 @@
 #ifdef USE_LIBIDL_CODE
     if ( tree->declspec & IDLF_DECLSPEC_PIDL ) {
-        /* PIDL interfaces are not normal CORBA Objects */
-        fprintf(ci->fh, "typedef struct %s_type *%s;\n", fullname, fullname);
-        fprintf(ci->fh, "#ifndef TC_%s\n", fullname);
-        fprintf(ci->fh, "#  define TC_%s TC_CORBA_Object\n", fullname);
-        fprintf(ci->fh, "#endif\n");
+      /* PIDL interfaces are not normal CORBA Objects */
+      fprintf(ci->fh, "typedef struct %s_type *%s;\n", fullname, fullname);
+      fprintf(ci->fh, "#ifndef TC_%s\n", fullname);
+      fprintf(ci->fh, "#  define TC_%s TC_CORBA_Object\n", fullname);
+      fprintf(ci->fh, "#endif\n");
     } else {
-        fprintf(ci->fh, "#define %s__freekids CORBA_Object__freekids\n", fullname);
-
-        fprintf(ci->fh, "typedef CORBA_Object %s;\n\n", fullname);
-        fprintf(ci->fh, "extern CORBA_unsigned_long %s__classid;\n", fullname);
-        ch_type_alloc_and_tc(tree, rinfo, ci, FALSE);
+      fprintf(ci->fh, "#define %s__freekids CORBA_Object__freekids\n", fullname);
+      
+      fprintf(ci->fh, "typedef CORBA_Object %s;\n\n", fullname);
+      fprintf(ci->fh, "extern CORBA_unsigned_long %s__classid;\n", fullname);
+      ch_type_alloc_and_tc(tree, rinfo, ci, FALSE);
     }
 #else
     fprintf(ci->fh, "#ifndef %s\n", fullname);
+#if 0
     /* For being more typesave when calling methods */
     fprintf(ci->fh, "typedef struct %s_struct {\n", fullname);
@@ -400 +401 @@
 
     fprintf(ci->fh, "#define %s %sObj\n", fullname, fullname);
+    fprintf(ci->fh, "typedef %s *P%s;\n", fullname, fullname);
+#endif
+    fprintf(ci->fh, "#define %s NOMObject\n", fullname);
     fprintf(ci->fh, "typedef %s *P%s;\n", fullname, fullname);
     fprintf(ci->fh, "#endif\n");

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

@@ -921 +921 @@
                 /* output params for macro */
                 // VoyagerWriteParamsForParentCall (ski->of, ski->tree );
-                fprintf(ski->of, "(nomSelf, ");
+                fprintf(ski->of, "((");
+                /* Output name of introducing class */
+                if(IDL_INTERFACE(tmptree).inheritance_spec) {
+                  InheritedOutputInfo ioi;
+
+                  ioi.of = ski->of;
+                  ioi.realif = tmptree;
+                  ioi.chrOverridenMethodName=gstr->str;
+                  IDL_tree_traverse_parents(IDL_INTERFACE(tmptree).inheritance_spec, (GFunc)VoyagerOutputIntroducingClass, &ioi);
+                }
+                fprintf(ski->of, "*)nomSelf, ");
+                //fprintf(ski->of, "(nomSelf, ");
                 if(IDL_INTERFACE(tmptree).inheritance_spec) {
                   InheritedOutputInfo ioi;