Changeset 101 for trunk/nom

Timestamp:

Nov 25, 2006, 5:26:24 PM (19 years ago)

Author:

cinc

Message:

Call nomInit() on new class objects and object instances.

Location:

trunk/nom

Files:

• class_c/nomcls.c (modified) (3 diffs)
• src/nombuildclass.c (modified) (5 diffs)

trunk/nom/class_c/nomcls.c

@@ -44 +44 @@
 
 #include "nomcls.ih"
-
 #include "nomclassmanager.h"
 
@@ -73 +72 @@
     return NULLHANDLE;
 
+  /* _nomInit() is called in _nomRenew() */
   return _nomRenew(nomSelf, (CORBA_Object)nObj, NULLHANDLE); /* This will also init the object */
 }
@@ -99 +99 @@
 NOM_Scope CORBA_Object NOMLINK impl_NOMClass_nomRenew(NOMClass* nomSelf, const CORBA_Object nomObj, CORBA_Environment *ev)
 {
-
   _nomRenewNoInit(nomSelf, nomObj, NULLHANDLE);
 
-  /* call somDefaultInit() for initialization */
-  /* _somDefaultInit((SOMObject*)obj); */
-  
-#warning !!!!! No _nomInitialize() for new objects !!!!!
   /* And now give the object the possibility to initialize... */
-  //_nomInitialize((NOMObject*)nomObj);
+  _nomInit((NOMObject*)nomObj, NULLHANDLE);
   
   return nomObj;

trunk/nom/src/nombuildclass.c

@@ -52 +52 @@
 
 /* Define if you want to have messages from somBuildClass() and friends */
-//#define DEBUG_NOMBUILDCLASS
+#define DEBUG_NOMBUILDCLASS
 /* Define if you want to have messages from building NOMObject */
 //#define DEBUG_BUILDNOMOBJECT
@@ -639 +639 @@
 #endif
 
-  /* nomClassReady() is called in nomBuildClass(), so don't call it here. */
+  /* nomClassReady() is called in nomBuildClass(), so don't call it here. Same goes for _nomInit(). */
   return nomClass;
 }
@@ -857 +857 @@
 #ifdef DEBUG_NOMBUILDCLASS
           nomPrintf("%s: class is %x\n", nomClass->mtab->nomClassName, nomClass);
-#endif      
+#endif    
+          _nomInit(nomClass, NULLHANDLE);
           _nomClassReady(nomClass, NULLHANDLE);
         }
@@ -873 +874 @@
         //#warning !!!!! No call of  _nomClassReady() here !!!!!
         //#if 0
+        _nomInit(nomClass, NULLHANDLE);
         _nomClassReady(nomClass, NULLHANDLE);   
         //#endif
@@ -965 +967 @@
 
   //priv_addPrivClassToGlobalClassList(pGlobalNomEnv, nClass);
-
+  _nomInit(nomClass, NULLHANDLE);
   _nomClassReady(nomClass, NULLHANDLE);
   return nomClass;