txx->cxx to avoid multi definition of symbols.

diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.cxx b/src/INTERP_KERNEL/Interpolation2DCurve.cxx
new file mode 100644 (file)
index 0000000..30891e2
--- /dev/null
+++ b/src/INTERP_KERNEL/Interpolation2DCurve.cxx
@@ -0,0 +1,59 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#include "Interpolation2DCurve.hxx"
+#include "InterpolationCurve.txx"
+
+namespace INTERP_KERNEL
+{
+  Interpolation2DCurve::Interpolation2DCurve()
+  {
+    // to have non-zero default thickness of target element
+    InterpolationOptions::setBoundingBoxAdjustmentAbs( InterpolationOptions::getPrecision() );
+  }
+
+  Interpolation2DCurve::Interpolation2DCurve
+    (const InterpolationOptions& io):InterpolationCurve<Interpolation2DCurve>(io)
+  {
+    // to have non-zero default thickness of target element
+    InterpolationOptions::setBoundingBoxAdjustmentAbs( InterpolationOptions::getPrecision() );
+  }
+
+  /**
+   *  \brief  Function used to set the options for the intersection calculation
+   * \details The following options can be modified:
+   *  -# Precision: Level of precision of the computations.
+   *   - Values: positive real number.
+   *   - Default: 1.0E-12.
+   *  -# Tolerance: Thickness of target element.
+   *   - Values: positive real number.
+   *   - Default: 1.0E-12.
+   *  -# Median line: Position of the median line where both segments will be projected.
+   *   - Values: real number between 0.0 and 1.0.
+   *   - Default: 0.5
+   */
+  void Interpolation2DCurve::setOptions (double precision,
+                                         double tolerance,
+                                         double medianLine)
+  {
+    InterpolationOptions::setPrecision(precision);
+    InterpolationOptions::setBoundingBoxAdjustmentAbs(tolerance);
+    InterpolationOptions::setMedianPlane(medianLine);
+  }
+}

diff --git a/src/INTERP_KERNEL/Interpolation2DCurve.txx b/src/INTERP_KERNEL/Interpolation2DCurve.txx
deleted file mode 100644 (file)
index 0aafe3f..0000000
--- a/src/INTERP_KERNEL/Interpolation2DCurve.txx
+++ /dev/null
@@ -1,63 +0,0 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef __INTERPOLATION2DCURVE_TXX__
-#define __INTERPOLATION2DCURVE_TXX__
-
-#include "Interpolation2DCurve.hxx"
-#include "InterpolationCurve.txx"
-
-namespace INTERP_KERNEL
-{
-  Interpolation2DCurve::Interpolation2DCurve()
-  {
-    // to have non-zero default thickness of target element
-    InterpolationOptions::setBoundingBoxAdjustmentAbs( InterpolationOptions::getPrecision() );
-  }
-
-  Interpolation2DCurve::Interpolation2DCurve
-    (const InterpolationOptions& io):InterpolationCurve<Interpolation2DCurve>(io)
-  {
-    // to have non-zero default thickness of target element
-    InterpolationOptions::setBoundingBoxAdjustmentAbs( InterpolationOptions::getPrecision() );
-  }
-
-  /**
-   *  \brief  Function used to set the options for the intersection calculation
-   * \details The following options can be modified:
-   *  -# Precision: Level of precision of the computations.
-   *   - Values: positive real number.
-   *   - Default: 1.0E-12.
-   *  -# Tolerance: Thickness of target element.
-   *   - Values: positive real number.
-   *   - Default: 1.0E-12.
-   *  -# Median line: Position of the median line where both segments will be projected.
-   *   - Values: real number between 0.0 and 1.0.
-   *   - Default: 0.5
-   */
-  void Interpolation2DCurve::setOptions (double precision,
-                                         double tolerance,
-                                         double medianLine)
-  {
-    InterpolationOptions::setPrecision(precision);
-    InterpolationOptions::setBoundingBoxAdjustmentAbs(tolerance);
-    InterpolationOptions::setMedianPlane(medianLine);
-  }
-}
-
-#endif

diff --git a/src/INTERP_KERNEL/Makefile.am b/src/INTERP_KERNEL/Makefile.am
index 4268d2c61a6907a3b2fea05c3b7048054582c589..2ccc2e844100fb4b9ffb3db01e760bff245f271a 100644 (file)
--- a/src/INTERP_KERNEL/Makefile.am
+++ b/src/INTERP_KERNEL/Makefile.am
@@ -159,7 +159,6 @@ CurveIntersectorP1P1.txx                \
 Interpolation1D.hxx                    \
 Interpolation1D.txx                    \
 Interpolation2DCurve.hxx                \
-Interpolation2DCurve.txx                \
 InterpolationCurve.hxx                 \
 InterpolationCurve.txx                 \
 DirectedBoundingBox.hxx
@@ -190,6 +189,7 @@ dist_libinterpkernel_la_SOURCES = \
        UnitTetraIntersectionBary.cxx \
        InterpolationOptions.cxx \
        DirectedBoundingBox.cxx \
+       Interpolation2DCurve.cxx \
        InterpKernelMeshQuality.cxx \
        InterpKernelCellSimplify.cxx
 

diff --git a/src/MEDCoupling/MEDCouplingRemapper.cxx b/src/MEDCoupling/MEDCouplingRemapper.cxx
index 872ec333e15ebeb55f6d0b5be0194fddc8e0e67c..25e5331b47f7dce4ca29fde5327a54f7866bb106 100644 (file)
--- a/src/MEDCoupling/MEDCouplingRemapper.cxx
+++ b/src/MEDCoupling/MEDCouplingRemapper.cxx
@@ -25,7 +25,7 @@
 #include "MEDCouplingNormalizedUnstructuredMesh.txx"
 
 #include "Interpolation1D.txx"
-#include "Interpolation2DCurve.txx"
+#include "Interpolation2DCurve.hxx"
 #include "Interpolation2D.txx"
 #include "Interpolation3D.txx"
 #include "Interpolation3DSurf.txx"

diff --git a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
index 7e2725d4aa060df44892e3c98c42a2ccd2451d3d..240452510a620c8764992288406c46514d9d9d2c 100644 (file)
--- a/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
+++ b/src/MEDCoupling/Test/MEDCouplingBasicsTestInterp.cxx
@@ -27,7 +27,7 @@
 #include "Interpolation3D.txx"
 #include "InterpolationCC.txx"
 #include "InterpolationCU.txx"
-#include "Interpolation2DCurve.txx"
+#include "Interpolation2DCurve.hxx"
 #include "Interpolation1D.txx"
 
 #include "MEDCouplingNormalizedUnstructuredMesh.txx"