From: cascade <cascade@opencascade.com>
Date: Thu, 31 Jul 2008 16:54:58 +0000 (+0000)
Subject: OCC20178 Conversion problems during VS2005 compilation
X-Git-Tag: V6_7_1~131
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=dfbd2ebaf34774bec05ed53cd838fb58a5ece98c;p=occt-wok.git

OCC20178 Conversion problems during VS2005 compilation
---

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");