From c4f24ec6c61d7f4150e4c9e60b43d5aa3e3f1173 Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 13 Mar 2008 15:01:58 +0000 Subject: [PATCH] *** empty log message *** --- src/INTERP_KERNEL/Geometric2D/Bounds.cxx | 2 +- src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx | 2 +- src/INTERP_KERNEL/Geometric2D/Edge.cxx | 1 - src/INTERP_KERNEL/Geometric2D/Edge.hxx | 3 ++- src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx | 2 +- src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx | 1 - src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx | 1 - src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx | 2 +- 8 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/INTERP_KERNEL/Geometric2D/Bounds.cxx b/src/INTERP_KERNEL/Geometric2D/Bounds.cxx index 0d4f2849d..74bfc7ab6 100644 --- a/src/INTERP_KERNEL/Geometric2D/Bounds.cxx +++ b/src/INTERP_KERNEL/Geometric2D/Bounds.cxx @@ -1,5 +1,5 @@ #include "Bounds.hxx" -#include "Exception.hxx" +#include "InterpolationUtils.hxx" #include "Node.hxx" #include diff --git a/src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx b/src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx index 205fb8274..ed0f94c3f 100644 --- a/src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx +++ b/src/INTERP_KERNEL/Geometric2D/ComposedEdge.cxx @@ -1,7 +1,7 @@ #include "ComposedEdge.hxx" #include "ElementaryEdge.hxx" #include "EdgeInfLin.hxx" -#include "Exception.hxx" +#include "InterpolationUtils.hxx" #include #include diff --git a/src/INTERP_KERNEL/Geometric2D/Edge.cxx b/src/INTERP_KERNEL/Geometric2D/Edge.cxx index 81cff38d4..b860bc287 100644 --- a/src/INTERP_KERNEL/Geometric2D/Edge.cxx +++ b/src/INTERP_KERNEL/Geometric2D/Edge.cxx @@ -3,7 +3,6 @@ #include "EdgeInfLin.hxx" //#include "EdgeParabol.hxx" #include "EdgeArcCircle.hxx" -#include "Exception.hxx" using namespace std; using namespace INTERP_KERNEL; diff --git a/src/INTERP_KERNEL/Geometric2D/Edge.hxx b/src/INTERP_KERNEL/Geometric2D/Edge.hxx index b73c86dd0..608fed38a 100644 --- a/src/INTERP_KERNEL/Geometric2D/Edge.hxx +++ b/src/INTERP_KERNEL/Geometric2D/Edge.hxx @@ -1,8 +1,8 @@ #ifndef __EDGE_HXX__ #define __EDGE_HXX__ +#include "InterpolationUtils.hxx" #include "ComposedEdge.hxx" -#include "Exception.hxx" #include "Bounds.hxx" #include "Node.hxx" @@ -111,6 +111,7 @@ namespace INTERP_KERNEL //! All non symetric methods are relative to 'e1'. Intersector(const Edge& e1, const Edge& e2):_e1(e1),_e2(e2) { } public: + virtual ~Intersector() { } virtual bool keepOrder() const = 0; //!to call only if 'areOverlapped' have been set to true when areOverlappedOrOnlyColinears was called virtual bool haveTheySameDirection() const = 0; diff --git a/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx index d3937bb8b..bd8ad250e 100644 --- a/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx +++ b/src/INTERP_KERNEL/Geometric2D/EdgeArcCircle.cxx @@ -1,6 +1,6 @@ #include "EdgeArcCircle.hxx" #include "EdgeLin.hxx" -#include "Exception.hxx" +#include "InterpolationUtils.hxx" #include "Node.hxx" #include diff --git a/src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx b/src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx index 2ff40f01e..749eb08e1 100644 --- a/src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx +++ b/src/INTERP_KERNEL/Geometric2D/EdgeLin.cxx @@ -1,6 +1,5 @@ #include "EdgeLin.hxx" #include "Node.hxx" -#include "Exception.hxx" using namespace std; using namespace INTERP_KERNEL; diff --git a/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx index af97833ab..797feee48 100644 --- a/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx +++ b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.cxx @@ -1,5 +1,4 @@ #include "ElementaryEdge.hxx" -#include "Exception.hxx" #include "Edge.hxx" using namespace INTERP_KERNEL; diff --git a/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx index adcdca298..364d22f16 100644 --- a/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx +++ b/src/INTERP_KERNEL/Geometric2D/ElementaryEdge.hxx @@ -2,7 +2,7 @@ #define __ELEMENTARYEDGE_HXX__ #include "AbstractEdge.hxx" -#include "Exception.hxx" +#include "InterpolationUtils.hxx" #include "Edge.hxx" namespace INTERP_KERNEL -- 2.39.2