Merge branch 'BR_v14_rc' into BR_quadtree

diff --cc src/HYDROData/CMakeLists.txt
Simple merge

diff --cc src/HYDROData/HYDROData_Bathymetry.cxx
Simple merge

diff --cc src/HYDROData/HYDROData_CalculationCase.cxx
index c2430aff628070636b3b5e24677f046da7ed3381,be8f1a8bc754b1ae72501518a4222e840f5c55e3..8814d9aaa28b5c31c4411c0303dfa03aa8c9a5b9
--- 1/src/HYDROData/HYDROData_CalculationCase.cxx
--- 2/src/HYDROData/HYDROData_CalculationCase.cxx
+++ b/src/HYDROData/HYDROData_CalculationCase.cxx
@@@ -67,14 -70,12 +70,18 @@@
  #include <BRepBuilderAPI_MakeVertex.hxx>
  #endif
  
+ #ifdef WIN32
+   #pragma warning ( default: 4251 )
+ #endif
+ 
  #define EXPORT_NAME "HYDRO_" + GetName()
  
 +#include <SALOME_NamingService.hxx>
 +#include <SALOME_LifeCycleCORBA.hxx>
 +
 +#define _DEVDEBUG_
 +#include "HYDRO_trace.hxx"
 +
  IMPLEMENT_STANDARD_HANDLE(HYDROData_CalculationCase, HYDROData_Entity)
  IMPLEMENT_STANDARD_RTTIEXT(HYDROData_CalculationCase, HYDROData_Entity)