porting of the merged code to SALOME 8.2.0

diff --git a/src/HYDROData/HYDROData_DTM.cxx b/src/HYDROData/HYDROData_DTM.cxx
index aae21b43f937fa9d807cc983d35a64ca8e0b29e5..e8663739d2e8593aad855e9fe3b192481b3bc0d8 100644 (file)
--- a/src/HYDROData/HYDROData_DTM.cxx
+++ b/src/HYDROData/HYDROData_DTM.cxx
@@ -40,11 +40,8 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
 #include <TopExp.hxx>
-<<<<<<< HEAD
-=======
 #include <TopTools_IndexedMapOfOrientedShape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
->>>>>>> origin/BR_HYDRO_IMPS_2016
 
 #include <BRepLib_MakeEdge.hxx>
 #include <BRepLib_MakeWire.hxx>
@@ -187,7 +184,7 @@ void HYDROData_DTM::PointsToEdge(const AltitudePoints& pnts, TopoDS_Edge& E )
   anInterpolator.Perform() ;
   if (anInterpolator.IsDone()) 
   {
-    Handle(Geom_Curve) C = anInterpolator.Curve();
+    Handle(Geom_BSplineCurve) C = anInterpolator.Curve();
     E = BRepBuilderAPI_MakeEdge(C).Edge();
   }
 }
@@ -539,8 +536,8 @@ Handle(Geom2d_BSplineCurve) HYDROData_DTM::CreateHydraulicAxis(
   theProfiles[0]->Update();
   for( size_t i = 1; i < n; i++ )
   {
-    Handle_HYDROData_Profile aProfile = theProfiles[i];
-    Handle_HYDROData_Profile aPrevProfile = theProfiles[i-1];
+    Handle(HYDROData_Profile) aProfile = theProfiles[i];
+    Handle(HYDROData_Profile) aPrevProfile = theProfiles[i-1];
 
     if( !IsCooriented( aProfile, aPrevProfile ) )
     {
@@ -556,8 +553,8 @@ Handle(Geom2d_BSplineCurve) HYDROData_DTM::CreateHydraulicAxis(
   // Stage 2. Calculate normals so that each normal "points" to the next profile
   for( size_t i = 0; i < n; i++ )
   {
-    Handle_HYDROData_Profile aProfile = theProfiles[i];
-    Handle_HYDROData_Profile aNextProfile = i==n-1 ? theProfiles[i-1] : theProfiles[i+1];
+    Handle(HYDROData_Profile) aProfile = theProfiles[i];
+    Handle(HYDROData_Profile) aNextProfile = i==n-1 ? theProfiles[i-1] : theProfiles[i+1];
 
     gp_Pnt aLowest;
     gp_Vec2d aNormal;

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 041a55d0ca385349fb5b6495a50d57e3470e632d..75c0c61f857a514ab76ef7c47bcc4fe7ca504256 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -75,7 +75,7 @@ SET( GEOM_INCLUDES $ENV{GEOM_ROOT_DIR}/include/salome )
 IF( ${WIN32} )
   link_directories( $ENV{CASROOT}/win32/libd )
 ELSE()
-  link_directories( $ENV{CASROOT}/lib )
+  link_directories( $ENV{CASROOT}/lib $ENV{TBB_ROOT_DIR}/lib/intel64/gcc4.4 )
 ENDIF()
 SET( CAS_LIBRARIES TKernel TKLCAF TKCAF TKCDF TKMath TKG2d TKG3d TKBRep TKGeomBase TKTopAlgo TKGeomAlgo TKBool TKShHealing TKXSBase TKOffset TKHLR TKBO TKV3d TKService TKMesh )