OCC19308 FIP #24.6 Make consistent Standard_CString and Standard_ExtString definition.

diff --git a/src/WOKUnix/WOKUnix_Buffer.cxx b/src/WOKUnix/WOKUnix_Buffer.cxx
index 1dec08559d128a8ad5922312858e85337b51ed96..97f7c8594ad2f2faf8544d3d035e6a820762ba9f 100755 (executable)
--- a/src/WOKUnix/WOKUnix_Buffer.cxx
+++ b/src/WOKUnix/WOKUnix_Buffer.cxx
@@ -5,6 +5,7 @@
 #include <WOKTools_Messages.hxx>
 
 #include <TCollection_HAsciiString.hxx>
+#include <Standard_PCharacter.hxx>
 
 //=======================================================================
 //function : WOKUnix_Buffer
@@ -92,8 +93,8 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKUnix_Buffer::Echo()
 
   myfd.Read(buffer, nbtoread);
 
-  Standard_CString aptr   = buffer.ToCString();
-  Standard_CString aptr2  = buffer.ToCString();
+  Standard_PCharacter aptr   = (Standard_PCharacter)buffer.ToCString();
+  Standard_PCharacter aptr2  = (Standard_PCharacter)buffer.ToCString();
   
   i=0;
   while(i<nbtoread)
@@ -130,8 +131,8 @@ Handle(TColStd_HSequenceOfHAsciiString) WOKUnix_Buffer::Errors()
 
   myfd.Read(buffer, nbtoread);
 
-  Standard_CString aptr   = buffer.ToCString();
-  Standard_CString aptr2  = buffer.ToCString();
+  Standard_PCharacter aptr   = (Standard_PCharacter)buffer.ToCString();
+  Standard_PCharacter aptr2  = (Standard_PCharacter)buffer.ToCString();
   
   i=0;
   while(i<nbtoread)

diff --git a/src/WOKUnix/WOKUnix_FDescr.cxx b/src/WOKUnix/WOKUnix_FDescr.cxx
index b04c0c1fe6afc1e1c157755aad93119355078cfd..15cb184174f2b12e30d20f5f0eb54f0f3f5724e4 100755 (executable)
--- a/src/WOKUnix/WOKUnix_FDescr.cxx
+++ b/src/WOKUnix/WOKUnix_FDescr.cxx
@@ -173,8 +173,8 @@ void WOKUnix_FDescr::BuildTemporary(const TCollection_AsciiString & apath)
   TCollection_AsciiString astr(apath);
   
   astr.AssignCat("/WOKXXXXXX");
-
-  char *name = mktemp(astr.ToCString()) ;
+  char *pPath=(char *)astr.ToCString();
+  char *name = mktemp(pPath) ;
 
   TCollection_AsciiString aName ( name ) ;
   OSD_Path aPath( aName ) ;
@@ -352,7 +352,7 @@ Handle(TCollection_HAsciiString) WOKUnix_FDescr::ReadLine()
 
       while(GetNbToRead() != 0)
        {
-         fgets(abuf.ToCString(), 1024, (FILE *) myFILE);
+         fgets((char*)abuf.ToCString(), 1024, (FILE *) myFILE);
          nbread = strlen(abuf.ToCString());
          if(astr.IsNull() && nbread < 1024)
            {

diff --git a/src/WOKUnix/WOKUnix_RegExp.cxx b/src/WOKUnix/WOKUnix_RegExp.cxx
index 000b515f5dd8526608e2dd6825b4d697a13754ab..24a13b1df56faa6f9c3ed5c4da6f831889df619e 100755 (executable)
--- a/src/WOKUnix/WOKUnix_RegExp.cxx
+++ b/src/WOKUnix/WOKUnix_RegExp.cxx
@@ -109,7 +109,7 @@ void WOKUnix_RegExp :: SetPattern (
  re_set_syntax ( syntax );
 
  errMsg = re_compile_pattern (
-           aPattern -> ToCString (), aPattern -> Length (), BUFFER
+           (char*)aPattern -> ToCString (), aPattern -> Length (), BUFFER
           );
 
  if ( errMsg != NULL ) {
@@ -133,7 +133,7 @@ Standard_Integer WOKUnix_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/WOKUnix/WOKUnix_RemoteShell.cxx b/src/WOKUnix/WOKUnix_RemoteShell.cxx
index 65da04d8aa4a732b1f3e7d0a557354c5878bced6..ce80f6b3bed50a08b0589333ef71aed9964591e5 100755 (executable)
--- a/src/WOKUnix/WOKUnix_RemoteShell.cxx
+++ b/src/WOKUnix/WOKUnix_RemoteShell.cxx
@@ -58,7 +58,7 @@
 : WOKUnix_Shell(apath, amode, outmode, bufmode)
 { 
 
-  char *rshellargv[]={"rsh" , ahost->ToCString(), "exec","/bin/csh", "-fs", NULL};
+  char *rshellargv[]={"rsh" , (char*)ahost->ToCString(), "exec","/bin/csh", "-fs", NULL};
   SetCommand(6,rshellargv);
 }