From 435f1a1b8f7bc749d3c280d01bc7121a9662cd33 Mon Sep 17 00:00:00 2001 From: maintenance team Date: Fri, 12 Sep 2008 10:13:14 +0000 Subject: [PATCH] Porting to CAS-6.3 --- src/GEOM/GEOM_Engine.cxx | 2 +- src/GEOM/GEOM_IOperations.hxx | 2 +- src/GEOM/GEOM_Object.cxx | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index a55f32fd4..5693abceb 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -716,7 +716,7 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin Standard_Integer aLen = theString.Length(); Standard_Boolean isFound = Standard_False; - char* arr = theString.ToCString(); + const char* arr = theString.ToCString(); Standard_Integer i = 0, j; while(i < aLen) { diff --git a/src/GEOM/GEOM_IOperations.hxx b/src/GEOM/GEOM_IOperations.hxx index 67781992d..1334adeaf 100644 --- a/src/GEOM/GEOM_IOperations.hxx +++ b/src/GEOM/GEOM_IOperations.hxx @@ -62,7 +62,7 @@ class GEOM_IOperations //Returns an error code of the last operatioin Standard_EXPORT char* GetErrorCode() { - return _errorCode.ToCString(); + return (char*) _errorCode.ToCString(); } //Returns a pointer to GEOM_Engine which this operation interface is associated diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index 6d5174d4d..4a3313333 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -88,7 +88,9 @@ Handle(GEOM_Object) GEOM_Object::GetObject(TDF_Label& theLabel) GEOM_Engine* anEngine= GEOM_Engine::GetEngine(); if(anEngine == NULL) return NULL; - return anEngine->GetObject(anID->Get(), anEntry.ToCString()); + return anEngine->GetObject(anID->Get(), (char*) anEntry.ToCString()); + + } //=============================================================================