From dfbd2ebaf34774bec05ed53cd838fb58a5ece98c Mon Sep 17 00:00:00 2001 From: cascade Date: Thu, 31 Jul 2008 16:54:58 +0000 Subject: [PATCH] OCC20178 Conversion problems during VS2005 compilation --- src/WOKUtils/WOKUtils_Param.cxx | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/WOKUtils/WOKUtils_Param.cxx b/src/WOKUtils/WOKUtils_Param.cxx index 2709b45..2d77a20 100755 --- a/src/WOKUtils/WOKUtils_Param.cxx +++ b/src/WOKUtils/WOKUtils_Param.cxx @@ -431,22 +431,18 @@ Handle(TCollection_HAsciiString) WOKUtils_Param::ClassFile(const Standard_CStrin //======================================================================= Handle(TCollection_HAsciiString) WOKUtils_Param::ClassSubFile(const Standard_CString aclass, const Standard_CString asub) const { - Standard_PCharacter thedir = strchr(asub, '@'); + Handle(TCollection_HAsciiString) result = new TCollection_HAsciiString(asub); + Standard_CString thedir = strchr(asub, '@'); if(thedir) - { - Handle(TCollection_HAsciiString) result = new TCollection_HAsciiString(&(thedir[1])); - result->AssignCat("/"); - *thedir = '\0'; - result->AssignCat(asub); - *thedir = '@'; - result->AssignCat("_"); - result->AssignCat(aclass); - result->AssignCat(".edl"); - return result; - } + { + Handle(TCollection_HAsciiString) res = new TCollection_HAsciiString(&(thedir[1])); + result->Trunc(thedir-asub); + res->AssignCat("/"); + res->AssignCat(result); + result = res; + } - Handle(TCollection_HAsciiString) result = new TCollection_HAsciiString(asub); result->AssignCat("_"); result->AssignCat(aclass); result->AssignCat(".edl"); -- 2.39.5