From: cascade <cascade@opencascade.com>
Date: Thu, 8 May 2008 17:11:10 +0000 (+0000)
Subject: OCC19308 FIP #24.6 Make consistent Standard_CString and Standard_ExtString definition.
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=4827a73d1cb22d74f0da5bed25b5e04b4d200744;p=occt-wok.git

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 14c0940..63fad7d 100755
--- 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 9a0ded6..11f35a1 100755
--- 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 cef50c5..47bcd58 100755
--- 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 5a82827..648fc6a 100755
--- 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 322e89e..9f05556 100755
--- 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)