Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from BR_imps_2013 14/01/2014
[modules/smesh.git]
/
src
/
StdMeshers_I
/
StdMeshers_ObjRefUlils.hxx
diff --git
a/src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx
b/src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx
index c7d6ed86561270514a89d0bac39bb4c4f7fb1c0a..32ae9b3e3051d0e39b2daf621d851d0254d3ce23 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx
+++ b/
src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx
@@
-68,7
+68,7
@@
public:
/*!
* \brief Return study entry of GEOM Object
*/
/*!
* \brief Return study entry of GEOM Object
*/
- static std::string GeomObjectToEntry(GEOM::GEOM_Object_ptr
&
theGeomObject);
+ static std::string GeomObjectToEntry(GEOM::GEOM_Object_ptr theGeomObject);
/*!
* \brief Return GEOM Object by its study entry or TopoDS_Shape
/*!
* \brief Return GEOM Object by its study entry or TopoDS_Shape
@@
-89,7
+89,7
@@
public:
* \param stream - the stream
* \retval TopoDS_Shape - resulting shape
*/
* \param stream - the stream
* \retval TopoDS_Shape - resulting shape
*/
- static TopoDS_Shape LoadFromStream( std::istream & stream );
+ static TopoDS_Shape LoadFromStream( std::istream & stream
, std::string* entry=NULL
);
/*!
* \brief Store the CORBA object in the stream
/*!
* \brief Store the CORBA object in the stream