Merge V8_3_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dda5a42ba248d6f4391364832199dcb985446f8..1fe7e3232b8883dff0e6e007255fa59fa845d1aa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/src/MEDCalculator/MEDCalculatorDBSliceField.hxx b/src/MEDCalculator/MEDCalculatorDBSliceField.hxx
index 1d07d27b2a6796a5c24c076380adb5a6d2c5ee7a..a580f0c87cb3639f222059bfb5389506e25c66bb 100644 (file)
--- a/src/MEDCalculator/MEDCalculatorDBSliceField.hxx
+++ b/src/MEDCalculator/MEDCalculatorDBSliceField.hxx
@@ -22,6 +22,7 @@
 #define __MEDCALCULATORDBSLICEFIELD_HXX__
 
 #include "MedCalculatorDefines.hxx"
+#include "MCType.hxx"
 #include "MEDCouplingRefCountObject.hxx"
 
 #include "InterpKernelException.hxx"

diff --git a/src/MEDCouplingCorba/Client/DataArrayIntClient.hxx b/src/MEDCouplingCorba/Client/DataArrayIntClient.hxx
index e20bb96fffc98b9b95a3ef59408d3e9ce253d9ab..5ec47813c86018146770ca197512f3f410bc5d6a 100644 (file)
--- a/src/MEDCouplingCorba/Client/DataArrayIntClient.hxx
+++ b/src/MEDCouplingCorba/Client/DataArrayIntClient.hxx
@@ -27,6 +27,7 @@
 #endif
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
+#include "MCType.hxx"
 
 namespace MEDCoupling
 {

diff --git a/src/MEDCouplingCorba/DataArrayIntServant.hxx b/src/MEDCouplingCorba/DataArrayIntServant.hxx
index 0c244b53a5be8756db0d8090d1a6f1d5ccdd526f..507b75a514448a0082b796647db13748948ac461 100644 (file)
--- a/src/MEDCouplingCorba/DataArrayIntServant.hxx
+++ b/src/MEDCouplingCorba/DataArrayIntServant.hxx
@@ -28,6 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingCorba.hxx"
 #include "DataArrayServant.hxx"
+#include "MCType.hxx"
 
 namespace MEDCoupling
 {

diff --git a/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx b/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx
index 7a9586f59eecc03ecf13ffdaef95d0e72e1c97b8..f3ab4e70ec563e0c967d936d1e0cc33342767f18 100644 (file)
--- a/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx
+++ b/src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx
@@ -21,6 +21,8 @@
 #ifndef __MEDCOUPLINGCORBAFIELDFACTORYCOMPONENT_HXX__
 #define __MEDCOUPLINGCORBAFIELDFACTORYCOMPONENT_HXX__
 
+#include "MCType.hxx"
+
 #include <string>
 
 namespace MEDCoupling