OCC19308 FIP #24.6 Make consistent Standard_CString and Standard_ExtString definition.

diff --git a/src/WOKNT/WOKNT_Path.cxx b/src/WOKNT/WOKNT_Path.cxx
index 14c0940947e26a21a679b9395ed89261215a305b..63fad7d5b9fed6004c58f85e84424c3eb4354973 100755 (executable)
--- a/src/WOKNT/WOKNT_Path.cxx
+++ b/src/WOKNT/WOKNT_Path.cxx
@@ -582,15 +582,15 @@ Standard_Boolean WOKNT_Path::IsNewer(const Handle(WOKNT_Path)& aName)
 
 Standard_Boolean WOKNT_Path::IsSameFile(const Handle( WOKNT_Path )& aPath)const {
 
-  Standard_CString newArgs[ 3 ];
+  Standard_PCharacter newArgs[ 3 ];
 
   if(myPath.IsNull()) return Standard_False;
   if(aPath.IsNull())  return Standard_False;
   if(aPath->Name().IsNull()) return Standard_False;
   
   newArgs[ 0 ] = "wokCMP";
-  newArgs[ 1 ] = myPath -> ToCString ();
-  newArgs[ 2 ] = aPath  -> Name () -> ToCString ();
+  newArgs[ 1 ] = (Standard_PCharacter)myPath -> ToCString ();
+  newArgs[ 2 ] = (Standard_PCharacter)aPath  -> Name () -> ToCString ();
 
   return !wokCMP(3, newArgs)? Standard_True : Standard_False;
 

diff --git a/src/WOKNT/WOKNT_RegExp.cxx b/src/WOKNT/WOKNT_RegExp.cxx
index 9a0ded67c9b315f0240a11721877b639310a3a8f..11f35a1c3965c50f8dd9aefeb6fb73549a8905f6 100755 (executable)
--- a/src/WOKNT/WOKNT_RegExp.cxx
+++ b/src/WOKNT/WOKNT_RegExp.cxx
@@ -106,8 +106,8 @@ void WOKNT_RegExp :: SetPattern (
 
  re_set_syntax ( syntax );
 
- errMsg = re_compile_pattern (
-           aPattern -> ToCString (), aPattern -> Length (), BUFFER
+ errMsg =  re_compile_pattern (
+           (char *)aPattern -> ToCString (), aPattern -> Length (), BUFFER
           );
 
  if ( errMsg != NULL ) {
@@ -131,7 +131,7 @@ Standard_Integer WOKNT_RegExp :: Search (
  Standard_Integer retVal;
  
  retVal = re_search (
-           BUFFER, aString -> ToCString (), aString -> Length (),
+           BUFFER, (char *)aString -> ToCString (), aString -> Length (),
            aStartPos - 1, 0, NULL
           );
 

diff --git a/src/WOKNT/WOKNT_Shell.cxx b/src/WOKNT/WOKNT_Shell.cxx
index cef50c58c17286ff69673dffc94cf3fa0e5d133f..47bcd587d0472f2fcb935393a0ccadcd7da62bc6 100755 (executable)
--- a/src/WOKNT/WOKNT_Shell.cxx
+++ b/src/WOKNT/WOKNT_Shell.cxx
@@ -222,7 +222,7 @@ void WOKNT_Shell :: Execute (  const Handle( TCollection_HAsciiString )& aCmdLin
 
     if (  !CreateProcess (
             NULL,                        // image name
-            cmd -> ToCString (),         // command line
+            (char *) cmd -> ToCString (),         // command line
             NULL,                        // security attributes for process ( default )
             NULL,                        // security attributes for primary thread ( default )
             TRUE,                        // handle inheritance
@@ -409,8 +409,8 @@ Standard_Address WOKNT_Shell :: BuildEnvironment (
  } else {
 
   int                      i;
-  Standard_CString         retVal;
-  Standard_CString         ptr;
+  Standard_PCharacter         retVal;
+  Standard_PCharacter        ptr;
   Standard_Integer         len = 0;
   WOKNT_CompareOfString comp;
   WOKNT_Array1OfString  env (  1, myEnvironment -> Length ()  );
@@ -428,7 +428,7 @@ Standard_Address WOKNT_Shell :: BuildEnvironment (
 
   for ( i = env.Lower (); i <= env.Upper (); ++i ) {
  
-   lstrcpy (  ptr, env.Value ( i ) -> ToCString ()  );
+   lstrcpy (  (char *)ptr,  env.Value ( i ) -> ToCString ()  );
    ptr += (  lstrlen ( ptr ) + 1  );
  
   }  // end for
@@ -591,11 +591,11 @@ Standard_Integer __fastcall _WOKNT_find_environment_variable (
 
 static void _WOKNT_get_env (  Handle( TColStd_HSequenceOfHAsciiString )& seq  ) {
 
- Standard_CString ptr, env;
+ Standard_PCharacter ptr, env;
 
  seq = new TColStd_HSequenceOfHAsciiString ();
 
- env = ptr = ( Standard_CString )GetEnvironmentStrings ();
+ env = ptr = (Standard_PCharacter)GetEnvironmentStrings ();
 
   if (  *ptr != TEXT( '\x00' )  )
 

diff --git a/src/WOKNT/WOKNT_Shell_1.cxx b/src/WOKNT/WOKNT_Shell_1.cxx
index 5a828274f80cb05e6e29872aa7231fbbe4cf849c..648fc6a4f1f3eefffc9d2e582105ecc5e048aac2 100755 (executable)
--- a/src/WOKNT/WOKNT_Shell_1.cxx
+++ b/src/WOKNT/WOKNT_Shell_1.cxx
@@ -391,7 +391,7 @@ Standard_Boolean WOKNT_Shell :: BuiltInCommand (
 
    for ( int i = 1; i <= args -> Length (); ++i )
 
-    argv[ i - 1 ] = args -> Value ( i ) -> ToCString ();
+    argv[ i - 1 ] = (TCHAR*)args -> Value ( i ) -> ToCString ();
 
    myStatus = ( *xFunc ) (  args -> Length (), argv  );
 

diff --git a/src/WOKNT/WOKNT_cp.cxx b/src/WOKNT/WOKNT_cp.cxx
index 322e89e73e9df37556773d4babb0796eaa69f7b4..9f05556e37ce8074a54584655865fc41f682afbc 100755 (executable)
--- a/src/WOKNT/WOKNT_cp.cxx
+++ b/src/WOKNT/WOKNT_cp.cxx
@@ -70,7 +70,7 @@ int wokCP( int argc, char** argv )
       if(woksrc->IsFile() && wokdst->IsDirectory())
        {
          newdst = new WOKNT_Path(wokdst->Name()->ToCString(), woksrc->FileName()->ToCString());
-         dst = newdst->Name()->ToCString();
+         dst = (char *) newdst->Name()->ToCString();
        }
       
       if(fRecurse)