From: adam Date: Tue, 6 Oct 2009 10:06:59 +0000 (+0000) Subject: windows port X-Git-Tag: V5_1_main_FINAL~321 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=54c64bd2309e0931a3bf8f945613091cc58226f0;p=tools%2Fmedcoupling.git windows port --- diff --git a/src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx b/src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx index 3fa757243..abecb5e45 100644 --- a/src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx +++ b/src/INTERP_KERNEL/Geometric2D/AbstractEdge.hxx @@ -19,6 +19,8 @@ #ifndef __ABSTRACTEDGE_HXX__ #define __ABSTRACTEDGE_HXX__ +#include "INTERPKERNELGEOMETRIC2DDefines.hxx" + #include #include #include @@ -35,7 +37,7 @@ namespace INTERP_KERNEL /*! * Asumption is done with this iterator that we iterate on a container containing more than one edge. */ - class IteratorOnComposedEdge + class INTERPKERNELGEOMETRIC2D_EXPORT IteratorOnComposedEdge { friend class ComposedEdge; friend class ElementaryEdge; diff --git a/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx index b3a4a3e20..17d4a82c2 100644 --- a/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx +++ b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.hxx @@ -19,11 +19,12 @@ #ifndef __EDGEARCCIRCLE_HXX__ #define __EDGEARCCIRCLE_HXX__ +#include "INTERPKERNELGEOMETRIC2DDefines.hxx" #include "Edge.hxx" namespace INTERP_KERNEL { - class ArcCArcCIntersector : public SameTypeEdgeIntersector + class INTERPKERNELGEOMETRIC2D_EXPORT ArcCArcCIntersector : public SameTypeEdgeIntersector { public: ArcCArcCIntersector(const EdgeArcCircle& e1, const EdgeArcCircle& e2); @@ -42,7 +43,7 @@ namespace INTERP_KERNEL double _dist; }; - class ArcCSegIntersector : public CrossTypeEdgeIntersector + class INTERPKERNELGEOMETRIC2D_EXPORT ArcCSegIntersector : public CrossTypeEdgeIntersector { public: ArcCSegIntersector(const EdgeArcCircle& e1, const EdgeLin& e2, bool reverse=true); @@ -61,7 +62,7 @@ namespace INTERP_KERNEL double _determinant; }; - class EdgeArcCircle : public Edge + class INTERPKERNELGEOMETRIC2D_EXPORT EdgeArcCircle : public Edge { public: EdgeArcCircle(std::istream& lineInXfig); diff --git a/src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx b/src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx index 0c11ae39b..b9dad71af 100644 --- a/src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx +++ b/src/INTERP_KERNEL/Geometric2D/EdgeLin.hxx @@ -19,6 +19,7 @@ #ifndef __EDGELIN_HXX__ #define __EDGELIN_HXX__ +#include "INTERPKERNELGEOMETRIC2DDefines.hxx" #include "Edge.hxx" namespace INTERP_KERNEL @@ -42,7 +43,7 @@ namespace INTERP_KERNEL double _matrix[4];//SPACEDIM*SPACEDIM }; - class EdgeLin : public Edge + class INTERPKERNELGEOMETRIC2D_EXPORT EdgeLin : public Edge { friend class SegSegIntersector; public: