diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-06-28 21:53:48 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-06-28 21:53:48 (GMT) |
| commit | 83724bd7873e3e199a94ba9c3526732d8117e996 (patch) | |
| tree | b724d9adeb1130e81bbf3afa8ec705b63067affe /src/H5public.h | |
| parent | b8f809981bb6c378e2a942aad551620feaa47125 (diff) | |
| download | hdf5-83724bd7873e3e199a94ba9c3526732d8117e996.zip hdf5-83724bd7873e3e199a94ba9c3526732d8117e996.tar.gz hdf5-83724bd7873e3e199a94ba9c3526732d8117e996.tar.bz2 | |
[svn-r30113] Description:
Clean up warnings (from 2774 -> 1560, with my standard debug build)
Tested on:
MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5public.h')
| -rw-r--r-- | src/H5public.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/H5public.h b/src/H5public.h index 554ad26..2f21648 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -194,28 +194,21 @@ H5_GCC_DIAG_ON(long-long) /* * File addresses have their own types. */ -#if H5_SIZEOF_INT64_T>=8 - typedef uint64_t haddr_t; -# define HADDR_UNDEF ((haddr_t)(int64_t)(-1)) -# define H5_SIZEOF_HADDR_T H5_SIZEOF_INT64_T -# ifdef H5_HAVE_PARALLEL -# define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT -# endif /* H5_HAVE_PARALLEL */ -#elif H5_SIZEOF_INT>=8 +#if H5_SIZEOF_INT >= 8 typedef unsigned haddr_t; # define HADDR_UNDEF ((haddr_t)(-1)) # define H5_SIZEOF_HADDR_T H5_SIZEOF_INT # ifdef H5_HAVE_PARALLEL # define HADDR_AS_MPI_TYPE MPI_UNSIGNED # endif /* H5_HAVE_PARALLEL */ -#elif H5_SIZEOF_LONG>=8 +#elif H5_SIZEOF_LONG >= 8 typedef unsigned long haddr_t; # define HADDR_UNDEF ((haddr_t)(long)(-1)) # define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG # ifdef H5_HAVE_PARALLEL # define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG # endif /* H5_HAVE_PARALLEL */ -#elif H5_SIZEOF_LONG_LONG>=8 +#elif H5_SIZEOF_LONG_LONG >= 8 typedef unsigned long long haddr_t; # define HADDR_UNDEF ((haddr_t)(long long)(-1)) # define H5_SIZEOF_HADDR_T H5_SIZEOF_LONG_LONG @@ -225,11 +218,11 @@ H5_GCC_DIAG_ON(long-long) #else # error "nothing appropriate for haddr_t" #endif -#if H5_SIZEOF_HADDR_T ==H5_SIZEOF_INT +#if H5_SIZEOF_HADDR_T == H5_SIZEOF_INT # define H5_PRINTF_HADDR_FMT "%u" -#elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG +#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG # define H5_PRINTF_HADDR_FMT "%lu" -#elif H5_SIZEOF_HADDR_T ==H5_SIZEOF_LONG_LONG +#elif H5_SIZEOF_HADDR_T == H5_SIZEOF_LONG_LONG # define H5_PRINTF_HADDR_FMT "%" H5_PRINTF_LL_WIDTH "u" #else # error "nothing appropriate for H5_PRINTF_HADDR_FMT" |