Fix compilation problems caused by the merge from BR_PARA_Integration branch

diff --git a/doc/doxygen/Makefile.am b/doc/doxygen/Makefile.am
index 152249ca10703e06c34e4bae3bdf43307a594221..1953fd0c80e7d6e8c4629ca2e1fbe06ccb25e326 100644 (file)
--- a/doc/doxygen/Makefile.am
+++ b/doc/doxygen/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 DOX_INPUT_FILE = Doxyfile_med_user
 
-install-data-local : main.dox 
+install-data-local : html-local main.dox 
        mkdir -p $(prefix)/doc/user ;\
        cp -r @builddir@/doc_ref_user/html $(prefix)/doc/user
 

diff --git a/src/INTERP_KERNEL/InterpKernelMatrix.hxx b/src/INTERP_KERNEL/InterpKernelMatrix.hxx
index 8fa96b6a110eeb143e63db47452361fcf6cf13aa..1d326aa0dd9655901c769ec812a0b90792bc95cc 100755 (executable)
--- a/src/INTERP_KERNEL/InterpKernelMatrix.hxx
+++ b/src/INTERP_KERNEL/InterpKernelMatrix.hxx
@@ -28,7 +28,7 @@ namespace INTERP_KERNEL
                        Row():std::vector< typename std::pair<int,T> >(){};
                        Row (const Row& row)
                        {
-                               resize(row.size());
+                               this->resize(row.size());
                                for (int i=0; i<this->size(); i++)
                                        (*this)[i]=row[i];
                        }

diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.hxx b/src/INTERP_KERNEL/Interpolation3DSurf.hxx
index f73f244197bcdc67e41c4a2b645184f284c1ab53..9b7b616526f9336ae3bacb52bc9924a07545f63d 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3DSurf.hxx
+++ b/src/INTERP_KERNEL/Interpolation3DSurf.hxx
@@ -21,8 +21,8 @@ namespace INTERP_KERNEL
     bool _doRotate;
     double _medianPlane;
     double _surf3DAdjustmentEps;
-    static const double DFT_MEDIAN_PLANE=0.5;
-    static const double DFT_SURF3D_ADJ_EPS=1e-4;
+    static const double DFT_MEDIAN_PLANE;
+    static const double DFT_SURF3D_ADJ_EPS;
   };
 }
 

diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.txx b/src/INTERP_KERNEL/Interpolation3DSurf.txx
index c1c36f5b445af96a38a0e4b4174f8a8acda5cd43..f51e1eb55e0305a0751f5ee2b854c0e3259428aa 100644 (file)
--- a/src/INTERP_KERNEL/Interpolation3DSurf.txx
+++ b/src/INTERP_KERNEL/Interpolation3DSurf.txx
@@ -6,6 +6,9 @@
 
 namespace INTERP_KERNEL
 {
+  const double Interpolation3DSurf::DFT_MEDIAN_PLANE=0.5;
+  const double Interpolation3DSurf::DFT_SURF3D_ADJ_EPS=1e-4;
+  
   Interpolation3DSurf::Interpolation3DSurf():_doRotate(true)
                                             ,_medianPlane(DFT_MEDIAN_PLANE)
                                             ,_surf3DAdjustmentEps(DFT_SURF3D_ADJ_EPS)

diff --git a/src/INTERP_KERNEL/InterpolationPlanar.hxx b/src/INTERP_KERNEL/InterpolationPlanar.hxx
index 3e63943103701fb5456a1fffb4055cb0d2aa1eed..d9aa7b703143546f936a823a3c8ed91c590f1f9a 100755 (executable)
--- a/src/INTERP_KERNEL/InterpolationPlanar.hxx
+++ b/src/INTERP_KERNEL/InterpolationPlanar.hxx
@@ -17,7 +17,7 @@ namespace INTERP_KERNEL
     double _precision;
     double _dimCaracteristic;
     IntersectionType _intersectionType;
-    static const double DEFAULT_PRECISION=1.e-12;
+    static const double DEFAULT_PRECISION;
   public:
     InterpolationPlanar();
   
@@ -43,3 +43,4 @@ namespace INTERP_KERNEL
 }
 
 #endif
+

diff --git a/src/INTERP_KERNEL/InterpolationPlanar.txx b/src/INTERP_KERNEL/InterpolationPlanar.txx
index 3ad80df84182ffb67c08a984eedbd5daae4f3440..73bc956ea466ec9f503ef07ae77254e82fbdb20d 100644 (file)
--- a/src/INTERP_KERNEL/InterpolationPlanar.txx
+++ b/src/INTERP_KERNEL/InterpolationPlanar.txx
@@ -18,6 +18,10 @@
 
 namespace INTERP_KERNEL
 {
+
+  template<class RealPlanar>
+  const double InterpolationPlanar<RealPlanar>::DEFAULT_PRECISION=1.e-12;
+
   /**
    * \defgroup interpolationPlanar InterpolationPlanar
    *

diff --git a/src/INTERP_KERNEL/PolygonAlgorithms.txx b/src/INTERP_KERNEL/PolygonAlgorithms.txx
index d6770fb46f83b405d284fe5b836862d63368b377..b60e826f12f9a8500740ff8a03e61a26a197c7f5 100644 (file)
--- a/src/INTERP_KERNEL/PolygonAlgorithms.txx
+++ b/src/INTERP_KERNEL/PolygonAlgorithms.txx
@@ -412,7 +412,7 @@ namespace INTERP_KERNEL
               case 1 :           
                 mi=_Status.find(i_glob);// pointer to the segment ending at i
                 i_prev_glob = ((*mi).second).first;//starting point of the segment ending at i
-                i_next= (i_prev_glob - i_glob > 0) == (fabs(i_prev_glob - i_glob) == 1)  ? i_glob - 1 : i_glob + 1;
+                i_next= (i_prev_glob - i_glob > 0) == (abs(i_prev_glob - i_glob) == 1)  ? i_glob - 1 : i_glob + 1;
                 if(i_glob < N1) i_next_glob = (i_next   +N1)%N1;
                 else            i_next_glob = (i_next-N1+N2)%N2 + N1;
                 _Status.erase(mi);
@@ -451,7 +451,7 @@ namespace INTERP_KERNEL
               case 1 :           
                 mi=_Status.find(i_glob);// pointer to the segment ending at i
                 i_prev_glob = ((*mi).second).first;//starting point of the segment ending at i
-                sign = (i_prev_glob - i_glob > 0) == (fabs(i_prev_glob - i_glob) == 1)  ? - 1 : + 1;
+                sign = (i_prev_glob - i_glob > 0) == (abs(i_prev_glob - i_glob) == 1)  ? - 1 : + 1;
                 i_next_glob = i_glob+sign;
                 _Is_in_intersection = ((*mi).second).second;//boolean that tells if i is in the intersection
                 _Status.erase(mi);

diff --git a/src/INTERP_KERNEL/Test/InterpolationPlanarTestSuite.hxx b/src/INTERP_KERNEL/Test/InterpolationPlanarTestSuite.hxx
index a937390d3edb24b998317c4a2323800edbed7224..ac97734590b9af74311a973eaec32441bc1fc922 100755 (executable)
--- a/src/INTERP_KERNEL/Test/InterpolationPlanarTestSuite.hxx
+++ b/src/INTERP_KERNEL/Test/InterpolationPlanarTestSuite.hxx
@@ -4,6 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <deque>
 #include <cmath>
+#include <iostream>
 
 using namespace std;
 
@@ -68,25 +69,25 @@ namespace INTERP_TEST
                {
                        for(int i = 0; i< (int)deque1.size(); i++)
                                {
-                                       cerr << deque1[i] << " ";
+                                       std::cerr << deque1[i] << " ";
                                }
-                       cerr<< endl;
+                       std::cerr<< endl;
                }
                void vectPrintOut(std::vector< double > vect)
                {
                        for(int i = 0; i< (int)vect.size(); i++)
                                {
-                                       cerr << vect[i] << " ";
+                                       std::cerr << vect[i] << " ";
                                }
-                       cerr<< endl;
+                       std::cerr<< endl;
                }       
                void tabPrintOut( const double * tab,int size)
                {
                        for(int i = 0; i< size; i++)
                                {
-                                       cerr << tab[i] << " ";
+                                       std::cerr << tab[i] << " ";
                                }
-                       cerr<< endl;
+                       std::cerr<< endl;
                }       
 
     /**

diff --git a/src/INTERP_KERNEL/TranslationRotationMatrix.hxx b/src/INTERP_KERNEL/TranslationRotationMatrix.hxx
index d3a9dd9a790938acc36fbaf55891a7815e4b3066..3804a4036120f0da03fa5d1938526ab41b12fd2d 100644 (file)
--- a/src/INTERP_KERNEL/TranslationRotationMatrix.hxx
+++ b/src/INTERP_KERNEL/TranslationRotationMatrix.hxx
@@ -100,12 +100,13 @@ namespace INTERP_KERNEL
                      
        
   private:
-    static const double EPS=1e-12;
+    static const double EPS;
     static const unsigned ROT_SIZE=9;
     static const unsigned TRANSL_SIZE=3;
     double _rotationCoeffs[ROT_SIZE];
     double _translationCoeffs[TRANSL_SIZE];
   };
+  const double TranslationRotationMatrix::EPS=1e-12;
 }
 
 #endif