From f567c01bb4151cc96a783bc026785f2315fc394b Mon Sep 17 00:00:00 2001 From: cas Date: Fri, 5 Nov 1999 18:28:10 +0000 Subject: [PATCH] No comments --- src/WOKernel/FILES | 1 + src/WOKernel/WOKernel_BasicUnitTypes.hxx | 2 +- src/WOKernel/WOKernel_DevUnit.cxx | 16 ++++++++-------- src/WOKernel/WOKernel_HAsciiStringHasher.cxx | 2 +- src/WOKernel/WOKernel_Session.cxx | 3 +-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/WOKernel/FILES b/src/WOKernel/FILES index 7e9687a..cb60d12 100755 --- 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 8a9d874..379efdd 100755 --- 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 f86831a..fc9df3e 100755 --- 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 2bb2257..d4db8c2 100755 --- 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 4da4a17..dab0b2c 100755 --- 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; -- 2.39.5