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
23080: [CEA 1497] Do not merge a middle node in quadratic with the extreme nodes...
[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 2f13689c1da73f726b350658b136010df6eaadb8..ed0ce004c1b7849a666cb3ba819981d1a161e53d 100644
(file)
--- a/
src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx
+++ b/
src/StdMeshers_I/StdMeshers_ObjRefUlils.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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