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 C++ part of kleontev/38044_auto_repair
[modules/geom.git]
/
src
/
GEOM
/
GEOM_PythonDump.hxx
diff --git
a/src/GEOM/GEOM_PythonDump.hxx
b/src/GEOM/GEOM_PythonDump.hxx
index 7736c343dd21c7f78536eaa99a2a302da6b0b415..fa26ad249239fc6cd52fc66bc518239efe7104ba 100644
(file)
--- a/
src/GEOM/GEOM_PythonDump.hxx
+++ b/
src/GEOM/GEOM_PythonDump.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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
@@
-48,10
+48,8
@@
namespace GEOM
//operator TCollection_AsciiString () const;
//operator TCollection_AsciiString () const;
-#if OCC_VERSION_MAJOR >= 7
template <class T>
Standard_EXPORT TPythonDump& operator<< (const Handle(T)& theObject) { return *this << theObject.get(); }
template <class T>
Standard_EXPORT TPythonDump& operator<< (const Handle(T)& theObject) { return *this << theObject.get(); }
-#endif
Standard_EXPORT TPythonDump& operator<< (bool theArg);
Standard_EXPORT TPythonDump& operator<< (long int theArg);
Standard_EXPORT TPythonDump& operator<< (int theArg);
Standard_EXPORT TPythonDump& operator<< (bool theArg);
Standard_EXPORT TPythonDump& operator<< (long int theArg);
Standard_EXPORT TPythonDump& operator<< (int theArg);
@@
-61,20
+59,20
@@
namespace GEOM
Standard_EXPORT TPythonDump& operator<< (const char* theArg);
Standard_EXPORT TPythonDump& operator<< (const TCollection_AsciiString theArg);
Standard_EXPORT TPythonDump& operator<< (const TopAbs_ShapeEnum theArg);
Standard_EXPORT TPythonDump& operator<< (const char* theArg);
Standard_EXPORT TPythonDump& operator<< (const TCollection_AsciiString theArg);
Standard_EXPORT TPythonDump& operator<< (const TopAbs_ShapeEnum theArg);
- Standard_EXPORT TPythonDump& operator<< (const Handle(GEOM_BaseObject)& theObject);
+ Standard_EXPORT TPythonDump& operator<< (const Handle(
::
GEOM_BaseObject)& theObject);
Standard_EXPORT TPythonDump& operator<< (const Handle(TColStd_HSequenceOfTransient)& objects);
Standard_EXPORT TPythonDump& operator<< (const Handle(TColStd_HSequenceOfTransient)& objects);
- Standard_EXPORT TPythonDump& operator<< (const std::list<Handle(GEOM_Object)>& theObjects);
+ Standard_EXPORT TPythonDump& operator<< (const std::list<Handle(
::
GEOM_Object)>& theObjects);
Standard_EXPORT TPythonDump& operator<< (const GEOM_BaseObject* theObject);
};
/*! Returns an object from two given, which has the latest entry
*/
Standard_EXPORT TPythonDump& operator<< (const GEOM_BaseObject* theObject);
};
/*! Returns an object from two given, which has the latest entry
*/
- Standard_EXPORT Handle(
GEOM_Object) GetCreatedLast (const Handle(GEOM_Objec
t)& theObj1,
-
const Handle(GEOM_Objec
t)& theObj2);
+ Standard_EXPORT Handle(
::GEOM_BaseObject) GetCreatedLast (const Handle(Standard_Transien
t)& theObj1,
+
const Handle(Standard_Transien
t)& theObj2);
/*! Returns an object from \a theObjects, which has the latest entry
*/
/*! Returns an object from \a theObjects, which has the latest entry
*/
- Standard_EXPORT Handle(
GEOM_
Object) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects);
+ Standard_EXPORT Handle(
::GEOM_Base
Object) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects);
}
#endif
}
#endif