Merge pull request #30 from byrnHDF/hdf5_1_12

Hdf5 1 12 merge changes from develop

Makefile.am

@@ -190,10 +190,10 @@ trace:
 # Run tests with different Virtual File Drivers.
 # Currently, only invoke check-vfd in the test directory.
 check-vfd:
-	for d in src utils test; do                                 \
-	  if test $$d != .; then                                       \
-	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;          \
-	  fi;                                                          \
+	for d in src utils test; do                                     \
+	  if test $$d != .; then                                        \
+	    (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;           \
+	  fi;                                                           \
 	done
 
 # Run tests with different passthrough Virtual Object Layer Connectors.

config/cmake_ext_mod/ConfigureChecks.cmake

@@ -69,6 +69,7 @@ if (MINGW)
   set (WINDOWS 1) # MinGW tries to imitate Windows
   set (CMAKE_REQUIRED_FLAGS "-DWIN32_LEAN_AND_MEAN=1 -DNOGDI=1")
   set (${HDF_PREFIX}_HAVE_WINSOCK2_H 1)
+  set (__USE_MINGW_ANSI_STDIO 1)
 endif ()
 
 if (WIN32 AND NOT MINGW)

config/cmake_ext_mod/HDFTests.c

@@ -178,7 +178,7 @@ int DebugReport(int reportType, char* message, int* returnValue)
 
 int main(void)
 {
-  char *llwidthArgs[] = { "I64", "l64", "l", "L", "q", "ll", NULL };
+  char *llwidthArgs[] = { "I64", "l64", "ll", "l", "L", "q", NULL };
   char *s = malloc(128);
   char **currentArg = NULL;
   LL_TYPE x = (LL_TYPE)1048576 * (LL_TYPE)1048576;

config/gnu-warnings/4.8

@@ -9,6 +9,9 @@
 
 # warning flag added for GCC >= 4.5
 -Wstrict-overflow=5
+# This warning can only be truly addressed using the gcc extension of
+# using D to indicate doubles (e.g., 1.23D).
+-Wno-unsuffixed-float-constants
 
 # warning flags added for GCC >= 4.6
 -Wdouble-promotion

config/gnu-warnings/developer-4.8

@@ -5,7 +5,6 @@
 # the variable is never *used* before it has been initialized?
 #
 -Wjump-misses-init
--Wunsuffixed-float-constants
 
 # developer warning flag added for GCC >= 4.6
 -Wsuggest-attribute=const

config/gnu-warnings/error-general

@@ -59,7 +59,7 @@
 #     jni/h5util.c
 #       -Werror=format(-overflow)
 #
--Wformat
+-Werror=format
 #
 #
 #Examples and tests do not use the same set of extensive warning flags as libraries

config/gnu-warnings/no-developer-4.8

@@ -1,6 +1,5 @@
 # no-developer warning flag added for GCC >= 4.5
 -Wno-jump-misses-init
--Wno-unsuffixed-float-constants
 
 # no-developer warning flag added for GCC >= 4.6
 -Wno-suggest-attribute=const

configure.ac

@@ -1248,6 +1248,7 @@ case "$host_cpu-$host_vendor-$host_os" in
     ## VFD on Linux systems.
     H5_CPPFLAGS="-D_GNU_SOURCE $H5_CPPFLAGS"
     ;;
+
 esac
 
 ## Need to add the AM_ and H5_ into CFLAGS/CPPFLAGS to make them visible
@@ -2035,7 +2036,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
 AC_MSG_CHECKING([how to print long long])
 AC_CACHE_VAL([hdf5_cv_printf_ll], [
 
-for hdf5_cv_printf_ll in l ll L q unknown; do
+for hdf5_cv_printf_ll in ll l L q unknown; do
    AC_RUN_IFELSE(
         [AC_LANG_PROGRAM([
             #include <stdio.h>

examples/h5_cmprss.c

@@ -99,7 +99,7 @@ main()
 
     for (i = 0; i < numfilt; i++) {
         nelmts      = 0;
-        filter_type = H5Pget_filter2(plist_id, 0, &flags, &nelmts, NULL, 0, NULL, &filter_info);
+        filter_type = H5Pget_filter2(plist_id, i, &flags, &nelmts, NULL, 0, NULL, &filter_info);
         printf("Filter Type: ");
         switch (filter_type) {
             case H5Z_FILTER_DEFLATE:

fortran/test/fortranlib_test.F90

@@ -183,7 +183,7 @@ PROGRAM fortranlibtest
   CALL write_test_status(ret_total_error, ' Multi file driver test', total_error)
 
   ret_total_error = 0
-  CALL test_chunk_cache (cleanup, ret_total_error)
+  CALL test_chunk_cache(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Dataset chunk cache configuration', total_error)
 
 !

hl/fortran/src/H5IMcc.c

@@ -29,7 +29,7 @@ herr_t H5IM_get_palette(hid_t loc_id, const char *image_name, int pal_number, hi
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, [email protected]
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -121,7 +121,7 @@ H5IMmake_image_8bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_t
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, [email protected]
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -236,7 +236,7 @@ H5IMmake_image_24bitf(hid_t loc_id, const char *dset_name, hsize_t width, hsize_
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, [email protected]
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -292,7 +292,7 @@ H5IMread_imagef(hid_t loc_id, const char *dset_name, int_f *buf)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, [email protected]
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -385,7 +385,7 @@ H5IMmake_palettef(hid_t loc_id, const char *pal_name, const hsize_t *pal_dims, i
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, [email protected]
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *
@@ -421,7 +421,7 @@ H5IMget_palettef(hid_t loc_id, const char *image_name, int pal_number, int_f *pa
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: Pedro Vicente Nunes, [email protected]
+ * Programmer: Pedro Vicente Nunes
  *
  * Date: May 10, 2005
  *

hl/fortran/src/H5IMfc.c

@@ -24,7 +24,7 @@
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -79,7 +79,7 @@ h5immake_image_8bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -129,7 +129,7 @@ h5imread_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *buf)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -192,7 +192,7 @@ h5immake_image_24bit_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 05, 2004
  *
@@ -269,7 +269,7 @@ h5imget_image_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *w
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -315,7 +315,7 @@ h5imis_image_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name)
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -365,7 +365,7 @@ h5immake_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *dim
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -425,7 +425,7 @@ h5imlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *ilen
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *
@@ -485,7 +485,7 @@ h5imunlink_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, size_t_f *il
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06 2004
  *
@@ -541,7 +541,7 @@ h5imget_npalettes_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, hsize_t_f *np
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06 2004
  *
@@ -600,7 +600,7 @@ h5imget_palette_info_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal
  *
  * Return: Success: 0, Failure: -1
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06 2004
  *
@@ -653,7 +653,7 @@ h5imget_palette_c(hid_t_f *loc_id, size_t_f *namelen, _fcd name, int_f *pal_numb
  *
  * Return: true, false, fail
  *
- * Programmer: [email protected]
+ * Programmer: Pedro Vicente
  *
  * Date: October 06, 2004
  *

hl/fortran/src/H5IMff.F90

@@ -41,7 +41,7 @@ MODULE h5im
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -95,7 +95,7 @@ END SUBROUTINE h5immake_image_8bit_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -142,7 +142,7 @@ END SUBROUTINE h5imread_image_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -204,7 +204,7 @@ END SUBROUTINE h5immake_image_24bit_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -267,7 +267,7 @@ END SUBROUTINE h5imget_image_info_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -313,7 +313,7 @@ END FUNCTION h5imis_image_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -364,7 +364,7 @@ END SUBROUTINE h5immake_palette_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -416,7 +416,7 @@ END SUBROUTINE h5imlink_palette_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -467,7 +467,7 @@ END SUBROUTINE h5imunlink_palette_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 05, 2004
 !
@@ -516,7 +516,7 @@ END SUBROUTINE h5imget_npalettes_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -567,7 +567,7 @@ END SUBROUTINE h5imget_palette_info_f
 !
 ! Return: Success: 0, Failure: -1
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !
@@ -619,7 +619,7 @@ END SUBROUTINE h5imget_palette_f
 !
 ! Return: true, false, fail
 !
-! Programmer: [email protected]
+! Programmer: Pedro Vicente
 !
 ! Date: October 06, 2004
 !