diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-17 17:07:10 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-17 17:07:10 (GMT) |
| commit | 9facd2347ad646acdf3cebda566b13902ead0c6b (patch) | |
| tree | 0407df7f5a97f562c2afa1bfebfc0fb7ff0c8d10 | |
| parent | fb3cc3767b182d2190f5d2ba839f588e1c139bc8 (diff) | |
| parent | ae5385b7ae0a273fc4940ae1f145cf4e73807ff5 (diff) | |
| download | hdf5-9facd2347ad646acdf3cebda566b13902ead0c6b.zip hdf5-9facd2347ad646acdf3cebda566b13902ead0c6b.tar.gz hdf5-9facd2347ad646acdf3cebda566b13902ead0c6b.tar.bz2 | |
Merge pull request #2146 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ae5385b7ae0a273fc4940ae1f145cf4e73807ff5':
Minor whitespace
Remove duplicate instance
| -rw-r--r-- | config/cmake_ext_mod/CTestCustom.cmake | 4 | ||||
| -rw-r--r-- | tools/test/perform/pio_standalone.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/config/cmake_ext_mod/CTestCustom.cmake b/config/cmake_ext_mod/CTestCustom.cmake index 025bce4..0111bef 100644 --- a/config/cmake_ext_mod/CTestCustom.cmake +++ b/config/cmake_ext_mod/CTestCustom.cmake @@ -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} ) diff --git a/tools/test/perform/pio_standalone.c b/tools/test/perform/pio_standalone.c index 022e390..dd6a61a 100644 --- a/tools/test/perform/pio_standalone.c +++ b/tools/test/perform/pio_standalone.c @@ -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 - |