From: vsr Date: Thu, 24 Apr 2008 11:40:46 +0000 (+0000) Subject: Fix compilation problems caused by the merge from BR_PARA_Integration branch X-Git-Tag: V5_0_0 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b04e25074c52c2d4d26727421fb70a7f61b3dcf1;p=tools%2Fmedcoupling.git 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 152249ca1..1953fd0c8 100644 --- 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 8fa96b6a1..1d326aa0d 100755 --- 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 >(){}; Row (const Row& row) { - resize(row.size()); + this->resize(row.size()); for (int i=0; isize(); i++) (*this)[i]=row[i]; } diff --git a/src/INTERP_KERNEL/Interpolation3DSurf.hxx b/src/INTERP_KERNEL/Interpolation3DSurf.hxx index f73f24419..9b7b61652 100644 --- 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 c1c36f5b4..f51e1eb55 100644 --- 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 3e6394310..d9aa7b703 100755 --- 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 3ad80df84..73bc956ea 100644 --- a/src/INTERP_KERNEL/InterpolationPlanar.txx +++ b/src/INTERP_KERNEL/InterpolationPlanar.txx @@ -18,6 +18,10 @@ namespace INTERP_KERNEL { + + template + const double InterpolationPlanar::DEFAULT_PRECISION=1.e-12; + /** * \defgroup interpolationPlanar InterpolationPlanar * diff --git a/src/INTERP_KERNEL/PolygonAlgorithms.txx b/src/INTERP_KERNEL/PolygonAlgorithms.txx index d6770fb46..b60e826f1 100644 --- 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 a937390d3..ac9773459 100755 --- a/src/INTERP_KERNEL/Test/InterpolationPlanarTestSuite.hxx +++ b/src/INTERP_KERNEL/Test/InterpolationPlanarTestSuite.hxx @@ -4,6 +4,7 @@ #include #include #include +#include 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 d3a9dd9a7..3804a4036 100644 --- 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