ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-08 02:47:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Porting SALOME6 on windows.

Browse Source
This commit is contained in:
rnv 2011-06-20 13:29:24 +00:00
parent 6243f56466
commit c8ed8f13dc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GEOMBase/GEOM_GenericObjPtr.h
View File

@ -25,6 +25,8 @@
#ifndef GEOM_GenericObjPtr_H #ifndef GEOM_GenericObjPtr_H
#define GEOM_GenericObjPtr_H #define GEOM_GenericObjPtr_H
#include "GEOM_GEOMBase.hxx"
#include "SALOMEconfig.h" #include "SALOMEconfig.h"
#include CORBA_SERVER_HEADER(GEOM_Gen) #include CORBA_SERVER_HEADER(GEOM_Gen)
@ -228,7 +230,7 @@ namespace GEOM
typedef GenericObjPtr<GEOM::GEOM_IGroupOperations> GroupOpPtr; typedef GenericObjPtr<GEOM::GEOM_IGroupOperations> GroupOpPtr;
typedef GenericObjPtr<GEOM::GEOM_IAdvancedOperations> AdvancedOpPtr; 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 #endif // GEOM_GenericObjPtr_H

8
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
View File

@ -20,6 +20,14 @@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // 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 <Python.h>
#include <structmember.h> #include <structmember.h>