diff options
| author | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-10-07 23:53:19 (GMT) |
|---|---|---|
| committer | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-10-07 23:53:19 (GMT) |
| commit | e2405c1091e71cf1e3186bb87c4ca8e696537aa2 (patch) | |
| tree | 0ce3cea16b879daf4a1dd8eb9826e9bc3e693251 /src | |
| parent | d7e83cc51016bfa201cfe1d49522286226816829 (diff) | |
| download | hdf5-e2405c1091e71cf1e3186bb87c4ca8e696537aa2.zip hdf5-e2405c1091e71cf1e3186bb87c4ca8e696537aa2.tar.gz hdf5-e2405c1091e71cf1e3186bb87c4ca8e696537aa2.tar.bz2 | |
Another cleanup pass as suggested by the reviewers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5FDmpio.c | 1 | ||||
| -rw-r--r-- | src/H5mpi.c | 7 | ||||
| -rw-r--r-- | src/H5private.h | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 0401418..11f0411 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -32,7 +32,6 @@ #include "H5Iprivate.h" /* IDs */ #include "H5MMprivate.h" /* Memory management */ #include "H5Pprivate.h" /* Property lists */ -#include "H5Sprivate.h" /* Large MPIO data type creation */ #ifdef H5_HAVE_PARALLEL diff --git a/src/H5mpi.c b/src/H5mpi.c index aa9004d..f01e16a 100644 --- a/src/H5mpi.c +++ b/src/H5mpi.c @@ -26,7 +26,10 @@ /****************/ /* Local Macros */ /****************/ - +#define TWO_GIG_LIMIT (1 << 31) +#ifndef H5_MAX_MPI_COUNT +#define H5_MAX_MPI_COUNT (1 << 30) +#endif /*******************/ /* Local Variables */ @@ -52,7 +55,7 @@ H5_mpio_set_bigio_count(hsize_t new_count) { hsize_t orig_count = bigio_count; - if((new_count > 0) && (new_count < TWO_GIG_LIMIT)) { + if((new_count > 0) && (new_count < (hsize_t)TWO_GIG_LIMIT)) { bigio_count = new_count; } return orig_count; diff --git a/src/H5private.h b/src/H5private.h index 016d69a..4ae9f12 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -2669,11 +2669,6 @@ H5_DLL herr_t H5_build_extpath(const char *name, char **extpath /*out*/); H5_DLL herr_t H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/); #ifdef H5_HAVE_PARALLEL -#define TWO_GIG_LIMIT 2147483648 -#ifndef H5_MAX_MPI_COUNT -#define H5_MAX_MPI_COUNT (1 << 30) -#endif - /* Generic MPI functions */ H5_DLL hsize_t H5_mpio_get_bigio_count(); H5_DLL herr_t H5_mpi_comm_dup(MPI_Comm comm, MPI_Comm *comm_new); |