No comments

diff --git a/src/WOKernel/FILES b/src/WOKernel/FILES
index 7e9687a5e78f417f7f5e375ad27ac1d2bd0b1035..cb60d12af03b836b6f0201c1ff63b636376de5b9 100755 (executable)
--- a/src/WOKernel/FILES
+++ b/src/WOKernel/FILES
@@ -1,3 +1,4 @@
 WOKernel_FileTypeKeyWords.hxx
 WOKernel_FileTypeKeyWords.cxx
 WOKernel_BasicUnitTypes.hxx
+

diff --git a/src/WOKernel/WOKernel_BasicUnitTypes.hxx b/src/WOKernel/WOKernel_BasicUnitTypes.hxx
index 8a9d874243b7f1ab34fae461c6ca61dd3634cd4c..379efdd82dacc4c9cd95ccfa6eec429d8314d37a 100755 (executable)
--- a/src/WOKernel/WOKernel_BasicUnitTypes.hxx
+++ b/src/WOKernel/WOKernel_BasicUnitTypes.hxx
@@ -11,7 +11,7 @@
 #define WOKernel_IsPackage(aunit)       (aunit->TypeCode() == 'p')
 #define WOKernel_IsSchema(aunit)        (aunit->TypeCode() == 's')
 #define WOKernel_IsInterface(aunit)     (aunit->TypeCode() == 'i')
-#define WOKernel_IsClient(aunit)        (aunit->TypeCode() == 'C')
+#define WOKernel_IsClient(aunit)        (aunit->TypeCode() == 'C'||aunit->TypeCode()=='j')
 #define WOKernel_IsEngine(aunit)        (aunit->TypeCode() == 'e')
 #define WOKernel_IsExecutable(aunit)    (aunit->TypeCode() == 'x')
 #define WOKernel_IsNocdlpack(aunit)     (aunit->TypeCode() == 'n')

diff --git a/src/WOKernel/WOKernel_DevUnit.cxx b/src/WOKernel/WOKernel_DevUnit.cxx
index f86831a18de7a4ce9865b3396197ac9358f9a0d2..fc9df3ecbbeef212a317dfe1e86ff83d98e5037b 100755 (executable)
--- a/src/WOKernel/WOKernel_DevUnit.cxx
+++ b/src/WOKernel/WOKernel_DevUnit.cxx
@@ -52,7 +52,7 @@
 WOKernel_DevUnit::WOKernel_DevUnit(const Handle(WOKernel_UnitTypeDescr)& atype,
                                   const Handle(TCollection_HAsciiString)& aname, 
                                   const Handle(WOKernel_UnitNesting)& anesting) 
-  : mytype(atype), WOKernel_Entity(aname, anesting)
+  : WOKernel_Entity(aname, anesting), mytype(atype)
 {
 }
 
@@ -990,12 +990,14 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKernel_DevUnit::ImplementationDep(cons
 {
   Handle(TColStd_HSequenceOfHAsciiString)  result = new TColStd_HSequenceOfHAsciiString;
   Handle(TColStd_HSequenceOfHAsciiString)  NULLRESULT;
-  Standard_Boolean                         IsCyclic = Standard_False;
+  Standard_Boolean                         IsCyclic;
   WOKernel_SortedImpldepFromIterator       algo;
   Standard_Integer                         i;
 
   try {
 
+    IsCyclic = Standard_False;
+
     agraph->Add(name,alist); 
     
     algo.FromVertex(name);
@@ -1039,9 +1041,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKernel_DevUnit::ImplementationDep(cons
       ErrorMsg << "WOKernel_DevUnit::ImplementationDep" << "Exception was raised : " << astream.str() << endm;
       return NULLRESULT ;
     }
-#ifdef WNT
-      return NULLRESULT;
-#endif  // WNT
+  return NULLRESULT;
 
 }
 
@@ -1099,6 +1099,8 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKernel_DevUnit::ImplClients(const Hand
 
   try {
 
+    IsCyclic = Standard_False;
+
     algo.FromVertex(Name());
     algo.Perform(aclientgraph);
     
@@ -1140,9 +1142,7 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKernel_DevUnit::ImplClients(const Hand
       ErrorMsg << "WOKernel_DevUnit::ImplClients" << "Exception was raised : " << astream.str() << endm;
       return NULLRESULT ;
     }
-#ifdef WNT
-      return NULLRESULT ;
-#endif  // WNT
+   return NULLRESULT ;
 }
 
 

diff --git a/src/WOKernel/WOKernel_HAsciiStringHasher.cxx b/src/WOKernel/WOKernel_HAsciiStringHasher.cxx
index 2bb2257e51db663bc29a027447e8019439135e86..d4db8c2c7ccee978523c226462c0fe21fa9ddf0d 100755 (executable)
--- a/src/WOKernel/WOKernel_HAsciiStringHasher.cxx
+++ b/src/WOKernel/WOKernel_HAsciiStringHasher.cxx
@@ -23,7 +23,7 @@ Standard_Integer WOKernel_HAsciiStringHasher::HashCode (const Handle(TCollection
   alen = Value->Length();
   
   while(i < alen) {
-    for (count = 0,pos = i;count < sizeof(int); count++) {
+    for (count = 0,pos = i;count < ( Standard_Integer )sizeof(int); count++) {
       if (pos + count >= alen)  tabchar[count] = '\0';
       else tabchar[count] = charPtr[pos + count];
       i++;

diff --git a/src/WOKernel/WOKernel_Session.cxx b/src/WOKernel/WOKernel_Session.cxx
index 4da4a170b22591d9e840e5ddacb5fef5d3473038..dab0b2cb08fbee5f5c757b4770525159ce5acbd6 100755 (executable)
--- a/src/WOKernel/WOKernel_Session.cxx
+++ b/src/WOKernel/WOKernel_Session.cxx
@@ -175,12 +175,11 @@ void WOKernel_Session::Open(const Handle(TCollection_HAsciiString)& aroot, const
   
   if(ahost.Failed()) ahost.Perror();
   
-  WOKernel_StationID thestation;
+  WOKernel_StationID thestation = WOKernel_SUN;
 
   switch(ahosttype)
     {
     case OSD_SUN:
-      thestation = WOKernel_SUN;
       break;
     case OSD_DEC:
       thestation = WOKernel_DECOSF;