Merge remote branch 'origin/hydro/imps_2015'

[modules/geom.git] / src / GEOM / GEOM_Engine.hxx

diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx
index 111096e722578108f59a84abdf368f3ae9df79a2..564774078010bbbbcd5412e0f060befecb7c1078 100644 (file)
--- a/src/GEOM/GEOM_Engine.hxx
+++ b/src/GEOM/GEOM_Engine.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  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
@@ -29,15 +29,12 @@
 
 #include <Basics_OCCTVersion.hxx>
 
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
 #include <TColStd_DataMapOfIntegerTransient.hxx>
-#else
-#include <Interface_DataMapOfIntegerTransient.hxx>
-#endif
 
 #include <Resource_DataMapOfAsciiStringAsciiString.hxx>
 #include <TDocStd_Document.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
+#include <TColStd_HArray1OfByte.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <TColStd_MapOfInteger.hxx>
 #include <TDF_Label.hxx>
@@ -58,12 +55,6 @@ struct TObjectData
   TCollection_AsciiString _pyName;
   bool                    _unpublished;
 };
-  
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
-class Handle_TColStd_HArray1OfByte;
-#else
-class Handle_TDataStd_HArray1OfByte;
-#endif
 
 struct TVariable{
   TCollection_AsciiString myVariable;