Changeset 139 for trunk/nom

Timestamp:

Dec 3, 2006, 11:25:38 AM (19 years ago)

Author:

cinc

Message:

Only use GLib types.

Location:

trunk/nom

Files:

• class_c/nomclassmanager.c (modified) (1 diff)
• idl/nombase.idl (modified) (1 diff)
• idl/nomclassmanager.idl (modified) (1 diff)
• include/nom.h (modified) (4 diffs)
• src/nombuildclass.c (modified) (1 diff)
• src/nombuildnomcls.c (modified) (1 diff)
• src/nombuildnomobj.c (modified) (2 diffs)

trunk/nom/class_c/nomclassmanager.c

@@ -129 +129 @@
 
 
-NOM_Scope pGData NOMLINK impl_NOMClassMgr_nomGetClassList(NOMClassMgr* nomSelf, CORBA_Environment *ev)
+NOM_Scope PGData NOMLINK impl_NOMClassMgr_nomGetClassList(NOMClassMgr* nomSelf, CORBA_Environment *ev)
 {
   NOMClassMgrData *nomThis = NOMClassMgrGetData(nomSelf);

trunk/nom/idl/nombase.idl

@@ -65 +65 @@
 /* Native types we want to use in the IDL */
 native  gpointer;
-native  pGData;
+native  PGData;
 
 #endif /* NOMBASE_IDL_INCLUDED */

trunk/nom/idl/nomclassmanager.idl

@@ -53 +53 @@
 
   void nomRegisterClass(in gpointer classMtab);
-  pGData nomGetClassList();
+  PGData nomGetClassList();
   gpointer nomGetClassInfoPtrFromName(in string className);
   void nomRegisterMethod(in gpointer classMtab, in string chrMethodName);
 
-  NOMINSTANCEVAR(pGData gdataClassList); 
-  NOMINSTANCEVAR(pGData gdataMethodList); 
+  NOMINSTANCEVAR(PGData gdataClassList); 
+  NOMINSTANCEVAR(PGData gdataMethodList); 
 
   /* nomInit : override;*/

trunk/nom/include/nom.h

@@ -83 +83 @@
 #endif
 
-typedef char integer1;
-typedef short integer2;
-typedef unsigned short uinteger2;
-typedef long integer4;
-typedef unsigned long uinteger4;
-typedef float float4;
-typedef double float8;
-typedef char *zString;                 /* NULL terminated string */
-typedef char *fString;                 /* non-terminated string  */
-typedef unsigned char octet;
-
 typedef gchar *string;
 
@@ -120 +109 @@
 typedef GQuark nomId;
 
-typedef GData* pGData;
+typedef GData* PGData;
 
-typedef char **nomID;                  
-typedef void *nomToken;                /*  */
+typedef gchar **nomID;                  
+typedef void *nomToken;                /* Use a gpointer instead of void* here?  */
 
 #ifndef NOM_BOOLEAN
@@ -131 +120 @@
 
 
-
-/* somtypes.h */
 /*  Object Instance Structure */
 struct nomMethodTabStruct;
 typedef struct NOMAnyObj_struct {
   struct nomMethodTabStruct  *mtab;
-  integer4 body[1];
+  gulong body[1];
 } NOMAnyObj;
 
@@ -147 +134 @@
 typedef NOMObject *CORBA_Object;
 
+/* The following is probably not correct... */
 typedef NOMAnyObj CORBA_Environment;
 
- /*#define nomresolve_(obj,mToken) (nomresolve(obj,mToken)) */
-
 #define nomresolve_(obj,mToken) ((nomMethodProc*)((void)obj, mToken))
-
-
-/* from oc's mtbl, with verification of o */
 #define NOM_Resolve(obj, objClassName, methodName) \
     (( nomTD_ ## objClassName ## _ ## methodName ) \

trunk/nom/src/nombuildclass.c

@@ -696 +696 @@
 
 
-NOMEXTERN NOMClass * NOMLINK nomBuildClass(NOM_ulong ulReserved,
+NOMEXTERN NOMClass * NOMLINK nomBuildClass(gulong ulReserved,
                                            nomStaticClassInfo *sci,
-                                           NOM_ulong ulMajorVersion,
-                                           NOM_ulong ulMinorVersion)
+                                           gulong ulMajorVersion,
+                                           gulong ulMinorVersion)
 {
   NOMClass *nomClass;

trunk/nom/src/nombuildnomcls.c

@@ -177 +177 @@
 {
   NOMClassPriv *nClass;
-  NOM_ulong ulParentDataSize=0;
+  gulong ulParentDataSize=0;
   NOMClassPriv *ncpParent;
   NOMClass *nomClass;

trunk/nom/src/nombuildnomobj.c

@@ -98 +98 @@
   NOMClassPriv *nClass; /* This struct holds our private data. A pointer will be in mtab->nomClsInfo */
 
-  NOM_ulong mtabSize;
-  NOM_ulong ulMemSize=0;
+  gulong mtabSize;
+  gulong ulMemSize=0;
   BYTE * mem;
   int a;
@@ -194 +194 @@
   !!! This function is only called once for building NOMObject !!!
  */
-NOMClassPriv * NOMLINK priv_buildNOMObjectClassInfo(NOM_ulong ulReserved,
+NOMClassPriv * NOMLINK priv_buildNOMObjectClassInfo(gulong ulReserved,
                                                     nomStaticClassInfo *sci,
-                                                    NOM_ulong majorVersion,
-                                                    NOM_ulong minorVersion)
+                                                    gulong majorVersion,
+                                                    gulong minorVersion)
 {
   NOMClassPriv *nClassPriv; /* This struct holds our private data. A pointer will be in mtab->nomClsInfo */