From 7c5e17b5b4baeb405c098055d5691952ee0a5a9e Mon Sep 17 00:00:00 2001 From: ageay Date: Mon, 13 Sep 2010 09:43:01 +0000 Subject: [PATCH] Avoid multiple symbol of TranslationRotationMatrix::EPS. --- src/INTERP_KERNEL/Makefile.am | 11 +++++----- .../TranslationRotationMatrix.cxx | 22 +++++++++++++++++++ .../TranslationRotationMatrix.hxx | 1 - 3 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 src/INTERP_KERNEL/TranslationRotationMatrix.cxx diff --git a/src/INTERP_KERNEL/Makefile.am b/src/INTERP_KERNEL/Makefile.am index a12507012..67e780fc0 100644 --- a/src/INTERP_KERNEL/Makefile.am +++ b/src/INTERP_KERNEL/Makefile.am @@ -177,12 +177,13 @@ VolSurfUser.txx # Libraries targets dist_libinterpkernel_la_SOURCES = \ - TransformedTriangle.cxx\ - TransformedTriangleIntersect.cxx\ - TransformedTriangleMath.cxx\ + TransformedTriangle.cxx \ + TransformedTriangleIntersect.cxx \ + TransformedTriangleMath.cxx \ BoundingBox.cxx \ - TetraAffineTransform.cxx\ - CellModel.cxx\ + TranslationRotationMatrix.cxx \ + TetraAffineTransform.cxx \ + CellModel.cxx \ UnitTetraIntersectionBary.cxx \ InterpolationOptions.cxx \ DirectedBoundingBox.cxx diff --git a/src/INTERP_KERNEL/TranslationRotationMatrix.cxx b/src/INTERP_KERNEL/TranslationRotationMatrix.cxx new file mode 100644 index 000000000..0e31b21e0 --- /dev/null +++ b/src/INTERP_KERNEL/TranslationRotationMatrix.cxx @@ -0,0 +1,22 @@ +// 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 "TranslationRotationMatrix.hxx" + +const double INTERP_KERNEL::TranslationRotationMatrix::EPS=1e-12; diff --git a/src/INTERP_KERNEL/TranslationRotationMatrix.hxx b/src/INTERP_KERNEL/TranslationRotationMatrix.hxx index 8258cf18e..6f6e411c2 100644 --- a/src/INTERP_KERNEL/TranslationRotationMatrix.hxx +++ b/src/INTERP_KERNEL/TranslationRotationMatrix.hxx @@ -125,7 +125,6 @@ namespace INTERP_KERNEL double _rotation_coeffs[ROT_SIZE]; double _translation_coeffs[TRANSL_SIZE]; }; - const double TranslationRotationMatrix::EPS=1e-12; } #endif -- 2.39.2