OCC19308 FIP #24.6 Make consistent Standard_CString and Standard_ExtString definition.

diff --git a/src/WOKStep/WOKStep_Include.cxx b/src/WOKStep/WOKStep_Include.cxx
index b44bab818e5611aa5318746491663b972123338f..c7ac9ee5a744f9cbb81caf21d828c815ba3ed07a 100755 (executable)
--- a/src/WOKStep/WOKStep_Include.cxx
+++ b/src/WOKStep/WOKStep_Include.cxx
@@ -226,11 +226,11 @@ void WOKStep_Include::Execute(const Handle(WOKMake_HSequenceOfInputFile)& tobuil
           }  // end if
 # endif  // WOKStep_Incluse_SYMLINK
 #else
-         Standard_CString args[ 4 ];
+         Standard_PCharacter args[ 4 ];
 
       args[ 0 ] = "wokCMP";
-      args[ 1 ] = infile -> File () -> Path () -> Name () -> ToCString ();
-      args[ 2 ] = pubincfile        -> Path () -> Name () -> ToCString ();
+      args[ 1 ] = (Standard_PCharacter)infile -> File () -> Path () -> Name () -> ToCString ();
+      args[ 2 ] = (Standard_PCharacter)pubincfile        -> Path () -> Name () -> ToCString ();
 
       if (  wokCMP ( 3, args )  ) {
 

diff --git a/src/WOKStep/WOKStep_ProcessStep.cxx b/src/WOKStep/WOKStep_ProcessStep.cxx
index 39b48ad26c778225a63700d6c3689df3052090d1..30e6a56318d65056946a051b5a9f62cd26851b1b 100755 (executable)
--- a/src/WOKStep/WOKStep_ProcessStep.cxx
+++ b/src/WOKStep/WOKStep_ProcessStep.cxx
@@ -59,6 +59,7 @@
 #include <WOKStep_ProcessStep.ixx>
 
 #include <WOKUtils_AdmFile.hxx>
+#include <Standard_PCharacter.hxx>
 
 #define READBUF_SIZE 1024
 
@@ -122,9 +123,9 @@ Handle(TCollection_HAsciiString) WOKStep_ProcessStep::GetUnitName(const Handle(T
   Handle(TCollection_HAsciiString) handleprefix = Unit()->Params().Eval("%FILENAME_HANDLEPREFIX");
   Handle(TCollection_HAsciiString) rejectlist   = Unit()->Params().Eval("%FILENAME_REJECTLIST");
   Handle(TCollection_HAsciiString) unitname;
-  Standard_CString ptr;
-  static Standard_CString unit = new char[1024];
-  Standard_CString unitptr;
+  Standard_PCharacter ptr;
+  static Standard_PCharacter unit = new char[1024];
+  Standard_PCharacter unitptr;
   Standard_Integer apos;
   
   unitptr = unit;
@@ -148,11 +149,11 @@ Handle(TCollection_HAsciiString) WOKStep_ProcessStep::GetUnitName(const Handle(T
   // Extraire le BaseName
   if((apos = aincpath->SearchFromEnd("/")) != -1)
     {
-      ptr = aincpath->ToCString() + apos;
+      ptr = (Standard_PCharacter)aincpath->ToCString() + apos;
     }
   else
     {
-      ptr = aincpath->ToCString();
+      ptr = (Standard_PCharacter)aincpath->ToCString();
     }