* Bug #12179 fixed - Fix an incompatibility with MPI version of HDF5.

Change-Id: I8b470eab2450790abc5f1433289972a033d725ec

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 85ef0f7..00e6d21 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -187,6 +187,8 @@ Bug fixes
 
 * Bug #12119 fixed - bar and barh had wrong x/y bounds.
 
+* Bug #12179 fixed - Fix an incompatibility with MPI version of HDF5.
+
 
                     Changes between version 5.3.3 and 5.4.0
                     =======================================

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
index 29a7272..ba27f34 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
@@ -10,6 +10,7 @@
 *
 */
 
+#include <hdf5.h>
 extern "C"
 {
 #include <string.h>

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
index fab1808..384c096 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
@@ -10,9 +10,9 @@
 *
 */
 
+#include <hdf5.h>
 extern "C"
 {
-#include <hdf5.h>
 #include <string.h>
 #include "gw_hdf5.h"
 #include "MALLOC.h"
@@ -954,7 +954,7 @@ static bool import_boolean_sparse(int _iDatasetId, int _iItemPos, int *_piAddres
     }
 
     FREE(piNbItemRow);
-    if(piColPos)
+    if (piColPos)
     {
         FREE(piColPos);
     }

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
index f007f1f..5e6e295 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_is_hdf5_file.cpp
@@ -10,9 +10,10 @@
 *
 */
 
+#include <hdf5.h>
+
 extern "C"
 {
-#include <hdf5.h>
 #include "gw_hdf5.h"
 #include "Scierror.h"
 #include "localization.h"
@@ -36,20 +37,20 @@ int sci_is_hdf5_file(char *fname, unsigned long fname_len)
     CheckLhs(1, 4);
 
     sciErr = getVarAddressFromPosition(pvApiCtx, 1, &piAddr);
-    if(sciErr.iErr)
+    if (sciErr.iErr)
     {
         printError(&sciErr, 0);
         return 1;
     }
 
-    if(getAllocatedSingleString(pvApiCtx, piAddr, &pstFile))
+    if (getAllocatedSingleString(pvApiCtx, piAddr, &pstFile))
     {
         Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), fname, 1);
         return 1;
     }
 
     char* pstFileName = expandPathVariable(pstFile);
-    if(isHDF5File(pstFileName))
+    if (isHDF5File(pstFileName))
     {
         createScalarBoolean(pvApiCtx, Rhs + 1, 1);
     }

diff --git a/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
index 365f90d..0b46f18 100644 (file)
--- a/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
@@ -10,9 +10,9 @@
 *
 */
 
+#include <hdf5.h>
 extern "C"
 {
-#include <hdf5.h>
 #include <string.h>
 #include "gw_hdf5.h"
 #include "MALLOC.h"

diff --git a/scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp b/scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
index efb68c2..68ec32e 100644 (file)
--- a/scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
+++ b/scilab/modules/hdf5/src/cpp/import_from_hdf5_v1.cpp
@@ -10,9 +10,9 @@
 *
 */
 
+#include <hdf5.h>
 extern "C"
 {
-#include <hdf5.h>
 #include <string.h>
 #include "gw_hdf5.h"
 #include "MALLOC.h"

diff --git a/scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp b/scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
index 41aab27..42b8695 100644 (file)
--- a/scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
+++ b/scilab/modules/hdf5/src/cpp/listvar_in_hdf5_v1.cpp
@@ -10,9 +10,9 @@
 *
 */
 
+#include <hdf5.h>
 extern "C"
 {
-#include <hdf5.h>
 #include <string.h>
 #include "gw_hdf5.h"
 #include "MALLOC.h"