From 5ebe302ba82eeb16d4940b9425a1d60b1b8af218 Mon Sep 17 00:00:00 2001 From: cascade Date: Thu, 8 May 2008 17:11:10 +0000 Subject: [PATCH] OCC19308 FIP #24.6 Make consistent Standard_CString and Standard_ExtString definition. --- src/WOKStep/WOKStep_Include.cxx | 6 +++--- src/WOKStep/WOKStep_ProcessStep.cxx | 11 ++++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/WOKStep/WOKStep_Include.cxx b/src/WOKStep/WOKStep_Include.cxx index b44bab8..c7ac9ee 100755 --- 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 39b48ad..30e6a56 100755 --- a/src/WOKStep/WOKStep_ProcessStep.cxx +++ b/src/WOKStep/WOKStep_ProcessStep.cxx @@ -59,6 +59,7 @@ #include #include +#include #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(); } -- 2.39.5