Porting SALOME6 on windows.

diff --git a/src/GEOMBase/GEOM_GenericObjPtr.h b/src/GEOMBase/GEOM_GenericObjPtr.h
index 43eca3feb7fd3d9301744b659439467ada29e9f8..fa48ae28dfcc904fa5befa97d4a41c5c5072d57b 100644 (file)
--- a/src/GEOMBase/GEOM_GenericObjPtr.h
+++ b/src/GEOMBase/GEOM_GenericObjPtr.h
@@ -25,6 +25,8 @@
 #ifndef GEOM_GenericObjPtr_H
 #define GEOM_GenericObjPtr_H
 
+#include "GEOM_GEOMBase.hxx"
+
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
@@ -228,7 +230,7 @@ namespace GEOM
   typedef GenericObjPtr<GEOM::GEOM_IGroupOperations>     GroupOpPtr;
   typedef GenericObjPtr<GEOM::GEOM_IAdvancedOperations>  AdvancedOpPtr;
 
-  template<> bool GenericObjPtr<GEOM::GEOM_Object>::isSame( GEOM::GEOM_Object_ptr theLeft, GEOM::GEOM_Object_ptr theRight );
+  template<> bool GEOMBASE_EXPORT GenericObjPtr<GEOM::GEOM_Object>::isSame( GEOM::GEOM_Object_ptr theLeft, GEOM::GEOM_Object_ptr theRight );
 }
 
 #endif // GEOM_GenericObjPtr_H

diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
index 329f4eec28ab1d2deda0bb1f28390290264f499b..b545e3c4880c24aa142d8b73d08a37b87f4a3543 100644 (file)
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@@ -20,6 +20,14 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
+#ifdef WNT
+// 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>
+#endif
+
 #include <Python.h>
 #include <structmember.h>