Salome HOME
projects
/
modules
/
geom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V6_5_BR 05/06/2012
[modules/geom.git]
/
src
/
GEOMClient
/
GEOM_Client.hxx
diff --git
a/src/GEOMClient/GEOM_Client.hxx
b/src/GEOMClient/GEOM_Client.hxx
index 4fffd02867168002483ee6d89e5d0e160caaa9cd..717efb3314274f8874f61d733bbbd481bf17c143 100644
(file)
--- a/
src/GEOMClient/GEOM_Client.hxx
+++ b/
src/GEOMClient/GEOM_Client.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
1
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
2
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
@@
-111,9
+111,9
@@
class GEOMCLIENT_EXPORT GEOM_Client {
//Standard_EXPORT
GEOM_Client(const GEOM_Client& client);
//Standard_EXPORT
//Standard_EXPORT
GEOM_Client(const GEOM_Client& client);
//Standard_EXPORT
- Standard_
Integer
Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
+ Standard_
Boolean
Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
//Standard_EXPORT
//Standard_EXPORT
- Standard_
Integer
Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
+ Standard_
Boolean
Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
//Standard_EXPORT
void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ;
//Standard_EXPORT
//Standard_EXPORT
void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ;
//Standard_EXPORT
@@
-134,10
+134,8
@@
class GEOMCLIENT_EXPORT GEOM_Client {
private:
// Fields PRIVATE
//
private:
// Fields PRIVATE
//
- TColStd_SequenceOfAsciiString myIORs ;
- TopTools_SequenceOfShape myShapes ;
- std::map< TCollection_AsciiString , int > _myIndexes;
std::map< TCollection_AsciiString , std::vector<TopoDS_Shape> > _mySubShapes;
std::map< TCollection_AsciiString , std::vector<TopoDS_Shape> > _mySubShapes;
+ std::map< TCollection_AsciiString , TopoDS_Shape > myShapesMap;
long pid_client;
};
long pid_client;
};