Porting to OCCT 7.8.0

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 8ecdaad063c624ca68aa916bbed8dcc631f99f5f..7783443c8ab35de7febefe435bb9fd80c4a393a4 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -1792,7 +1792,7 @@ namespace
     {
       BRepBuilderAPI_MakeWire newWire;
 
-      typedef NCollection_DataMap<SMESH_TLink, TopoDS_Edge, SMESH_TLink > TSeg2EdgeMap;
+      typedef NCollection_DataMap<SMESH_TLink, TopoDS_Edge, SMESH_TLinkHasher > TSeg2EdgeMap;
       TSeg2EdgeMap seg2EdgeMap;
 
       TopoDS_Iterator edgeIt( wire );

diff --git a/src/GUI/BLSURFPluginGUI.cxx b/src/GUI/BLSURFPluginGUI.cxx
index 2406a3bcbfe76355991e1a95bbd97275fedba75d..9321da32ca34e9787d180b83194cb3d5fe0f46f3 100644 (file)
--- a/src/GUI/BLSURFPluginGUI.cxx
+++ b/src/GUI/BLSURFPluginGUI.cxx
@@ -26,7 +26,7 @@
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...
-#include <Standard_math.hxx>
+#include <Standard_Real.hxx>
   #include <Python.h>
   #include <pymath.h>
 #endif

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
index 334980ddc7d527d6f2db9b0517cbc68a728013a2..22236c68d0b3aeba0ea0980da2ec7d71cf8bff65 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h
@@ -48,11 +48,11 @@
 
 #include <Python.h>
 #ifdef WIN32
-  // E.A. : On windows with python 2.6, there is a conflict
-  // E.A. : between pymath.h and Standard_math.h which define
-  // E.A. : some same symbols : acosh, asinh, ...
-  #include <Standard_math.hxx>
-  #include <pymath.h>
+// E.A. : On windows with python 2.6, there is a conflict
+// E.A. : between pymath.h and Standard_math.h which define
+// E.A. : some same symbols : acosh, asinh, ...
+#include <Standard_Real.hxx>
+#include <pymath.h>
 #endif
 
 #include <QItemDelegate>