ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-09-22 10:42:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

return right CORBA value to avoid messages like 'free(): invalid pointer'

Browse Source
This commit is contained in:
jfa 2005-09-13 10:18:10 +00:00
parent 01adc22141
commit 0f0729266b
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/GEOM_I/GEOM_IOperations_i.cc
View File

@ -1,15 +1,12 @@
#include <Standard_Stream.hxx>
#include "GEOM_IOperations_i.hh"
#include "GEOM_Engine.hxx"
#include "utilities.h"
#include "OpUtil.hxx"
#include "Utils_ExceptHandlers.hxx"
#include "GEOM_Engine.hxx"
//#include "GEOM_Gen_i.hh"
#include <Standard_Stream.hxx>
#include <TCollection_AsciiString.hxx>
#include <TDF_Tool.hxx>
@ -36,46 +33,46 @@ GEOM_IOperations_i::~GEOM_IOperations_i()
//=============================================================================
/*!
/*!
* IsDone
*/
//=============================================================================
//=============================================================================
CORBA::Boolean GEOM_IOperations_i::IsDone()
{
return _impl->IsDone();
}
}
//=============================================================================
/*!
/*!
* SetErrorCode
*/
//=============================================================================
//=============================================================================
void GEOM_IOperations_i::SetErrorCode(const char* theErrorCode)
{
_impl->SetErrorCode((char*)theErrorCode);
}
//=============================================================================
/*!
* GetErrorCode
*/
//=============================================================================
char* GEOM_IOperations_i::GetErrorCode()
//=============================================================================
char* GEOM_IOperations_i::GetErrorCode()
{
return _impl->GetErrorCode();
return CORBA::string_dup(_impl->GetErrorCode());
}
//=============================================================================
/*!
* GetStudyID
*/
//=============================================================================
CORBA::Long GEOM_IOperations_i::GetStudyID()
//=============================================================================
CORBA::Long GEOM_IOperations_i::GetStudyID()
{
return _impl->GetDocID();
return _impl->GetDocID();
}
//=============================================================================
/*!
* StartOperation
@ -112,12 +109,11 @@ void GEOM_IOperations_i::AbortOperation()
* GetObject
*/
//=============================================================================
GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObject)
GEOM::GEOM_Object_ptr GEOM_IOperations_i::GetObject(Handle(GEOM_Object) theObject)
{
if(theObject.IsNull()) return NULL;
TCollection_AsciiString anEntry;
TDF_Tool::Entry(theObject->GetEntry(), anEntry);
GEOM::GEOM_Object_var GO = GEOM::GEOM_Object::_duplicate(_engine->GetObject(theObject->GetDocID(), anEntry.ToCString()));
return GO._retn();
}
}