From: Paul RASCLE <paul.rascle@edf.fr>
Date: Tue, 30 Jun 2015 16:21:10 +0000 (+0200)
Subject: Merge branch 'BR_v14_rc' into BR_quadtree
X-Git-Tag: BR_quadtree_20150925~17
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=10a9948d19f358b0ccf850d362d8ad8173b3ea5f;p=modules%2Fhydro.git

Merge branch 'BR_v14_rc' into BR_quadtree
---

10a9948d19f358b0ccf850d362d8ad8173b3ea5f
diff --cc src/HYDROData/HYDROData_CalculationCase.cxx
index c2430aff,be8f1a8b..8814d9aa
--- a/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)