Another cleanup pass as suggested by the reviewers.

This commit is contained in:
Richard Warren 2019-10-07 19:53:19 -04:00
parent d7e83cc510
commit e2405c1091
3 changed files with 5 additions and 8 deletions

View File

@ -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

View File

@ -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;

View File

@ -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);