ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-29 10:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting to CAS-6.3

Browse Source
This commit is contained in:
maintenance team 2008-09-10 11:59:54 +00:00
parent b18fdbd570
commit 98c2eb992f
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/GEOM/GEOM_Engine.cxx
View File

@ -714,7 +714,7 @@ Handle(TColStd_HSequenceOfInteger) FindEntries(TCollection_AsciiString& theStrin
Standard_Integer aLen = theString.Length(); Standard_Integer aLen = theString.Length();
Standard_Boolean isFound = Standard_False; Standard_Boolean isFound = Standard_False;
char* arr = theString.ToCString(); const char* arr = theString.ToCString();
Standard_Integer i = 0, j; Standard_Integer i = 0, j;
while(i < aLen) { while(i < aLen) {

2
src/GEOM/GEOM_IOperations.hxx
View File

@ -62,7 +62,7 @@ class GEOM_IOperations
//Returns an error code of the last operatioin //Returns an error code of the last operatioin
Standard_EXPORT char* GetErrorCode() { Standard_EXPORT char* GetErrorCode() {
return _errorCode.ToCString(); return (char*) _errorCode.ToCString();
} }
//Returns a pointer to GEOM_Engine which this operation interface is associated //Returns a pointer to GEOM_Engine which this operation interface is associated

4
src/GEOM/GEOM_Object.cxx
View File

@ -88,7 +88,9 @@ Handle(GEOM_Object) GEOM_Object::GetObject(TDF_Label& theLabel)
GEOM_Engine* anEngine= GEOM_Engine::GetEngine(); GEOM_Engine* anEngine= GEOM_Engine::GetEngine();
if(anEngine == NULL) return NULL; if(anEngine == NULL) return NULL;
return anEngine->GetObject(anID->Get(), anEntry.ToCString()); return anEngine->GetObject(anID->Get(), (char*) anEntry.ToCString());
} }
//============================================================================= //=============================================================================

2
src/GEOMBase/GEOMBase_Helper.cxx
View File

@ -627,7 +627,7 @@ char* GEOMBase_Helper::getEntry( GEOM::GEOM_Object_ptr object ) const
if ( IOR != "" ) { if ( IOR != "" ) {
_PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) ); _PTR(SObject) SO ( study->studyDS()->FindObjectIOR( IOR ) );
if ( SO ) { if ( SO ) {
return TCollection_AsciiString((char*)SO->GetID().c_str()).ToCString(); return (char*) TCollection_AsciiString((char*)SO->GetID().c_str()).ToCString();
} }
} }
} }

4
src/GEOM_I/GEOM_Gen_i.cc
View File

@ -313,7 +313,7 @@ SALOMEDS::TMPFile* GEOM_Gen_i::Save(SALOMEDS::SComponent_ptr theComponent,
// Build a full file name of temporary file // Build a full file name of temporary file
TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt; TCollection_AsciiString aFullName = TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt;
// Save GEOM component in this file // Save GEOM component in this file
_impl->Save(theComponent->GetStudy()->StudyId(), aFullName.ToCString()); _impl->Save(theComponent->GetStudy()->StudyId(), (char*) aFullName.ToCString());
// Conver a file to the byte stream // Conver a file to the byte stream
aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq.in(), isMultiFile); aStreamFile = SALOMEDS_Tool::PutFilesToStream(aTmpDir.c_str(), aSeq.in(), isMultiFile);
// Remove the created file and tmp directory // Remove the created file and tmp directory
@ -375,7 +375,7 @@ CORBA::Boolean GEOM_Gen_i::Load(SALOMEDS::SComponent_ptr theComponent,
TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt); TCollection_AsciiString aFullName = (TCollection_AsciiString((char*)aTmpDir.c_str()) + aNameWithExt);
// Open document // Open document
if (!_impl->Load(theComponent->GetStudy()->StudyId(), aFullName.ToCString())) return false; if (!_impl->Load(theComponent->GetStudy()->StudyId(), (char*) aFullName.ToCString())) return false;
// Remove the created file and tmp directory // Remove the created file and tmp directory
if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq.in(), true); if (!isMultiFile) SALOMEDS_Tool::RemoveTemporaryFiles(aTmpDir.c_str(), aSeq.in(), true);