OCC20825 Errors during compilation for new version of WOK

diff --git a/src/WOKBuilder/WOKBuilder_DLLinker.cxx b/src/WOKBuilder/WOKBuilder_DLLinker.cxx
index 76330f35215c9b423589c8bbf48baf40c72e4bdd..0fc0ff2487a7c25f71de65bf8b7c2aca8d34a7d6 100755 (executable)
--- a/src/WOKBuilder/WOKBuilder_DLLinker.cxx
+++ b/src/WOKBuilder/WOKBuilder_DLLinker.cxx
@@ -67,15 +67,18 @@ Handle(TCollection_HAsciiString) WOKBuilder_DLLinker::EvalFooter()
   tmp = EvalToolTemplate ( "LinkerPDB" );
   retVal -> AssignCat ( tmp );
   outEnt[3] = new WOKBuilder_SharedLibrary(new WOKUtils_Path(tmp));
+
+#if _MSC_VER >= 1400
   outEnt[4] = new WOKBuilder_ManifestLibrary(new WOKUtils_Path(EvalToolTemplate("DLLMAN")));
-  SetProduction(new WOKBuilder_HSequenceOfEntity());
+#endif
 
-  Produces()->Append(outEnt[0]);
-  Produces()->Append(outEnt[1]);
-  Produces()->Append(outEnt[2]);
+  SetProduction(new WOKBuilder_HSequenceOfEntity());
 
-  Produces()->Append(outEnt[3]);
-  Produces()->Append(outEnt[4]);
+  for ( int i = 0; i < 5; i++ )
+  {
+    if ( !outEnt[ i ].IsNull() )
+      Produces()->Append( outEnt[ i ] );
+  }
   return retVal;
 }
 

diff --git a/src/WOKBuilder/WOKBuilder_EXELinker.cxx b/src/WOKBuilder/WOKBuilder_EXELinker.cxx
index 774b989ee12946a9bc221d716767332a6a2b79fc..3e63087327dff7ccdf9f995325df582fd090aca9 100755 (executable)
--- a/src/WOKBuilder/WOKBuilder_EXELinker.cxx
+++ b/src/WOKBuilder/WOKBuilder_EXELinker.cxx
@@ -66,15 +66,31 @@ Handle(TCollection_HAsciiString) WOKBuilder_EXELinker::EvalFooter()
  retVal->AssignCat(tmp);
  outEnt[1] = new WOKBuilder_SharedLibrary(new WOKUtils_Path(tmp));
  //  }
+#if _MSC_VER >= 1400
  outEnt[2] = new WOKBuilder_ManifestLibrary(new WOKUtils_Path(EvalToolTemplate("EXEMAN")));
+#endif
+
  SetProduction(new WOKBuilder_HSequenceOfEntity);
- Produces()->Append(outEnt[0]);
- 
- //if(fDebug) 
- Produces()->Append(outEnt[1]);
- Produces()->Append(outEnt[2]);
+
+ for ( int i = 0; i < 3; i++ )
+ {
+  if ( !outEnt[ i ].IsNull() )
+    Produces()->Append( outEnt[ i ] );
+ }
 
  return retVal;
 }
 
 
+
+
+
+
+
+
+
+
+
+
+
+

diff --git a/src/WOKBuilder/WOKBuilder_MSTranslator.cxx b/src/WOKBuilder/WOKBuilder_MSTranslator.cxx
index ff59ed5371552fa25bf77a753ab3d5ca4bc614de..475929db441893bdc0025bec3bed3b0416bda215 100755 (executable)
--- a/src/WOKBuilder/WOKBuilder_MSTranslator.cxx
+++ b/src/WOKBuilder/WOKBuilder_MSTranslator.cxx
@@ -1594,17 +1594,19 @@ WOKBuilder_BuildStatus WOKBuilder_MSTranslator::BuildGenClass(const Handle(WOKBu
        // END JGA
        
        Handle(MS_GenClass) agenclass = Handle(MS_GenClass)::DownCast(ameta->GetType(anaction->Entity()->Name()));
-       Handle(MS_InstClass) instclass;
-       Handle(TColStd_HSequenceOfHAsciiString) nestedinst = agenclass->GetNestedInsClassesName();
-       for(i=1; i<=nestedinst->Length(); i++)
-         {
-           Handle(TCollection_HAsciiString) fullname = MS::BuildFullName(agenclass->Package()->Name(), nestedinst->Value(i));
+       if(!agenclass.IsNull()) {
+         Handle(MS_InstClass) instclass;
+         Handle(TColStd_HSequenceOfHAsciiString) nestedinst = agenclass->GetNestedInsClassesName();
+         for(i=1; i<=nestedinst->Length(); i++)
+           {
+             Handle(TCollection_HAsciiString) fullname = MS::BuildFullName(agenclass->Package()->Name(), nestedinst->Value(i));
            
-           instclass = Handle(MS_InstClass)::DownCast(MSchema()->MetaSchema()->GetType(fullname));
+             instclass = Handle(MS_InstClass)::DownCast(MSchema()->MetaSchema()->GetType(fullname));
            
-           if(! instclass.IsNull())
-             AddAction(anit,instclass->GenClass(), WOKBuilder_GenType);
-         }
+             if(! instclass.IsNull())
+               AddAction(anit,instclass->GenClass(), WOKBuilder_GenType);
+           }
+       }
       }
       break;
     default: