Merge pull request #2146 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'ae5385b7ae0a273fc4940ae1f145cf4e73807ff5':
  Minor whitespace
  Remove duplicate instance
This commit is contained in:
Allen Byrne 2019-12-17 11:07:10 -06:00
commit 9facd2347a
2 changed files with 2 additions and 6 deletions

View File

@ -1,5 +1,5 @@
set (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000)
set (CTEST_CUSTOM_WARNING_EXCEPTION
${CTEST_CUSTOM_WARNING_EXCEPTION}
"note.*expected.*void.*but argument is of type.*volatile"
@ -10,7 +10,7 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
"warning.*implicit declaration of function"
"note: expanded from macro"
)
set (CTEST_CUSTOM_MEMCHECK_IGNORE
${CTEST_CUSTOM_MEMCHECK_IGNORE}
)

View File

@ -162,8 +162,4 @@ print_version(const char *progname)
H5_VERS_SUBRELEASE[0] ? "-" : "", H5_VERS_SUBRELEASE);
}
#ifdef H5_HAVE_PARALLEL
MPI_Info h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */
#endif