From b14417185c487c900ea210f346c910a9bfe1d506 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Mon, 3 Feb 2003 17:52:16 -0500 Subject: [PATCH] [svn-r6373] Purpose: Update Description: Added support for defining what the haddr type is in terms of MPI types. Solution: Include some #defines when we typedef haddr... Platforms tested: Linux (For FPHDF5 stuff)... --- src/H5public.h | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/H5public.h b/src/H5public.h index ccf0fb8704..62238cf925 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -159,20 +159,35 @@ typedef ssize_t hssize_t; * File addresses have there own types. */ #if H5_SIZEOF_UINT64_T>=8 - typedef uint64_t haddr_t; -# define HADDR_UNDEF ((haddr_t)(int64_t)(-1)) + typedef uint64_t haddr_t; +# define HADDR_UNDEF ((haddr_t)(int64_t)(-1)) +# ifdef H5_HAVE_PARALLEL +# define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT +# endif /* H5_HAVE_PARALLEL */ #elif H5_SIZEOF_INT>=8 - typedef unsigned haddr_t; -# define HADDR_UNDEF ((haddr_t)(-1)) + typedef unsigned haddr_t; +# define HADDR_UNDEF ((haddr_t)(-1)) +# ifdef H5_HAVE_PARALLEL +# define HADDR_AS_MPI_TYPE MPI_UNSIGNED +# endif /* H5_HAVE_PARALLEL */ #elif H5_SIZEOF_LONG>=8 - typedef unsigned long haddr_t; -# define HADDR_UNDEF ((haddr_t)(long)(-1)) + typedef unsigned long haddr_t; +# define HADDR_UNDEF ((haddr_t)(long)(-1)) +# ifdef H5_HAVE_PARALLEL +# define HADDR_AS_MPI_TYPE MPI_UNSIGNED_LONG +# endif /* H5_HAVE_PARALLEL */ #elif H5_SIZEOF_LONG_LONG>=8 - typedef unsigned long long haddr_t; -# define HADDR_UNDEF ((haddr_t)(long long)(-1)) + typedef unsigned long long haddr_t; +# define HADDR_UNDEF ((haddr_t)(long long)(-1)) +# ifdef H5_HAVE_PARALLEL +# define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT +# endif /* H5_HAVE_PARALLEL */ #elif H5_SIZEOF___INT64>=8 - typedef unsigned __int64 haddr_t; -# define HADDR_UNDEF ((haddr_t)(__int64)(-1)) + typedef unsigned __int64 haddr_t; +# define HADDR_UNDEF ((haddr_t)(__int64)(-1)) +# ifdef H5_HAVE_PARALLEL +# define HADDR_AS_MPI_TYPE MPI_LONG_LONG_INT +# endif /* H5_HAVE_PARALLEL */ #else # error "nothing appropriate for haddr_t" #endif