diff options
| author | Robb Matzke <matzke@llnl.gov> | 1999-07-28 19:37:35 (GMT) |
|---|---|---|
| committer | Robb Matzke <matzke@llnl.gov> | 1999-07-28 19:37:35 (GMT) |
| commit | 2681ce4a86ca3c6400ba242bc336d23c77753ff5 (patch) | |
| tree | f4cb88dcd07675a7a4c76141a080148cee1eabc7 /src/H5Fprivate.h | |
| parent | e4834c43ce6528308ebd5375bd4c7a0df88af427 (diff) | |
| download | hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.zip hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.gz hdf5-2681ce4a86ca3c6400ba242bc336d23c77753ff5.tar.bz2 | |
[svn-r1549] Changes since 19990728
----------------------
./src/H5B.c [1.3]
./src/H5D.c [1.3]
./src/H5F.c [1.3]
./src/H5Farray.c [1.3]
./src/H5Fcore.c [1.3]
./src/H5Ffamily.c [1.3]
./src/H5Fistore.c [1.3]
./src/H5Flow.c [1.3]
./src/H5Fmpio.c [1.3]
./src/H5Fprivate.h [1.3]
./src/H5Fsplit.c [1.3]
./src/H5Fstdio.c [1.3]
./src/H5G.c [1.3]
./src/H5HG.c [1.3]
./src/H5HL.c [1.3]
./src/H5MF.c [1.3]
./src/H5O.c [1.3]
./src/H5Odtype.c [1.3]
./src/H5Oefl.c [1.3]
./src/H5P.c [1.3]
./src/H5Smpio.c [1.3]
./src/H5T.c [1.3]
./src/H5detect.c [1.3]
./tools/h5debug.c [1.3]
Some of the H5F_addr_* functions were optimized away.
./src/H5D.c [1.3]
Fixed the return values from NULL to FAIL on one MPI-IO
function.
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index ab5b748..85aa03b 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -701,8 +701,8 @@ __DLL__ herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms); /* Address-related macros and functions */ #define H5F_ADDR_UNDEF ((uint64_t)(-1L)) -#define H5F_addr_defined(X) (X!=H5F_ADDR_UNDEF) #define H5F_addr_hash(X,M) ((unsigned)((X)%(M))) +#define H5F_addr_defined(X) (X!=H5F_ADDR_UNDEF) #define H5F_addr_eq(X,Y) ((X)!=H5F_ADDR_UNDEF && \ (Y)!=H5F_ADDR_UNDEF && \ (X)==(Y)) @@ -719,17 +719,13 @@ __DLL__ herr_t H5F_low_flush(H5F_low_t *lf, const H5F_access_t *access_parms); #define H5F_addr_ge(X,Y) ((X)!=H5F_ADDR_UNDEF && \ (Y)!=H5F_ADDR_UNDEF && \ (X)>=(Y)) -#define H5F_addr_undef(XP) (*(XP)=H5F_ADDR_UNDEF) -#define H5F_addr_reset(XP) (*(XP)=0) -#define H5F_addr_zerop(X) ((X)==0) -__DLL__ void H5F_addr_inc(haddr_t *addr/*in,out*/, hsize_t inc); +#define H5F_addr_cmp(X,Y) (H5F_addr_eq(X,Y)?0: \ + (H5F_addr_lt(X, Y)?-1:1)) +#define H5F_addr_pow2(N) ((haddr_t)1<<(N)) + __DLL__ void H5F_addr_encode(H5F_t *, uint8_t**/*in,out*/, haddr_t); __DLL__ void H5F_addr_decode(H5F_t *, const uint8_t**/*in,out*/, haddr_t*/*out*/); -__DLL__ void H5F_addr_pow2(uintn n, haddr_t *addr/*out*/); -__DLL__ void H5F_addr_add(haddr_t *a1/*in,out*/, haddr_t a2); -__DLL__ intn H5F_addr_cmp(haddr_t a1, haddr_t a2); -__DLL__ void H5F_addr_adj(haddr_t *addr/*in,out */, hssize_t adj); __DLL__ herr_t H5F_addr_pack(H5F_t UNUSED *f, haddr_t *addr_p/*out*/, const unsigned long objno[2]); |