X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM%2FGEOM_PythonDump.hxx;h=633fd44d049274885b1937b0eca2be8947400243;hb=4084b64c;hp=b9b83a7ea0c3c2b8ef6dcb7c8ea2aa8cc2366c49;hpb=73555c78ebf12a1fdb85157b8e7934ad566ae90a;p=modules%2Fgeom.git

diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx
index b9b83a7ea..633fd44d0 100644
--- a/src/GEOM/GEOM_PythonDump.hxx
+++ b/src/GEOM/GEOM_PythonDump.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -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
-// 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
@@ -30,6 +30,8 @@
 
 #include <TCollection_AsciiString.hxx>
 
+#include <list>
+
 namespace GEOM
 {
   class TPythonDump
@@ -41,11 +43,15 @@ namespace GEOM
     Handle(GEOM_Function) myFunction;
 
   public:
-    Standard_EXPORT TPythonDump (Handle(GEOM_Function)& theFunction, bool theAppend=false);
+    Standard_EXPORT TPythonDump (const Handle(GEOM_Function)& theFunction, bool theAppend=false);
     Standard_EXPORT virtual ~TPythonDump();
 
     //operator TCollection_AsciiString () const;
 
+#if OCC_VERSION_MAJOR >= 7
+    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);
@@ -53,18 +59,22 @@ namespace GEOM
     Standard_EXPORT TPythonDump& operator<< (float theArg);
     Standard_EXPORT TPythonDump& operator<< (const void* 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_Object)& theObject);
+    Standard_EXPORT TPythonDump& operator<< (const Handle(::GEOM_BaseObject)& theObject);
+    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 GEOM_BaseObject* theObject);
   };
 
   /*! Returns an object from two given, which has the latest entry
    */
-  Standard_EXPORT Handle(GEOM_Object) GetCreatedLast (const Handle(GEOM_Object)& theObj1,
-                                      const Handle(GEOM_Object)& theObj2);
+  Standard_EXPORT Handle(::GEOM_Object) GetCreatedLast (const Handle(::GEOM_Object)& theObj1,
+                                      const Handle(::GEOM_Object)& theObj2);
 
   /*! 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_Object) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects);
 }
 
 #endif