diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-01-04 15:31:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2020-01-04 15:31:30 (GMT) |
| commit | 4f98de52d64a283b6ff63281c2e06365b3b94df0 (patch) | |
| tree | bddf2c7f13aaaa309e5aeb74d96cc12e5fc52e4a /src/H5Fprivate.h | |
| parent | 99e990e1ee8b6610793b8a2eb87bd2e2c77ab020 (diff) | |
| parent | 0225e6d59698c9a720177766794619c7ad273f4a (diff) | |
| download | hdf5-4f98de52d64a283b6ff63281c2e06365b3b94df0.zip hdf5-4f98de52d64a283b6ff63281c2e06365b3b94df0.tar.gz hdf5-4f98de52d64a283b6ff63281c2e06365b3b94df0.tar.bz2 | |
Merge pull request #2228 in HDFFV/hdf5 from minor_improvements_from_token_refactor to develop
* commit '0225e6d59698c9a720177766794619c7ad273f4a':
Small changes from the token_refactoring branch, to reduce the delta to develop
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 4008eb8..75ef0a9 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -247,29 +247,29 @@ typedef struct H5F_t H5F_t; } /* Address-related macros */ -#define H5F_addr_overflow(X,Z) (HADDR_UNDEF==(X) || \ - HADDR_UNDEF==(X)+(haddr_t)(Z) || \ +#define H5F_addr_overflow(X,Z) (HADDR_UNDEF==(X) || \ + HADDR_UNDEF==(X)+(haddr_t)(Z) || \ (X)+(haddr_t)(Z)<(X)) #define H5F_addr_defined(X) ((X)!=HADDR_UNDEF) /* The H5F_addr_eq() macro guarantees that Y is not HADDR_UNDEF by making * certain that X is not HADDR_UNDEF and then checking that X equals Y */ -#define H5F_addr_eq(X,Y) ((X)!=HADDR_UNDEF && \ +#define H5F_addr_eq(X,Y) ((X)!=HADDR_UNDEF && \ (X)==(Y)) #define H5F_addr_ne(X,Y) (!H5F_addr_eq((X),(Y))) -#define H5F_addr_lt(X,Y) ((X)!=HADDR_UNDEF && \ - (Y)!=HADDR_UNDEF && \ +#define H5F_addr_lt(X,Y) ((X)!=HADDR_UNDEF && \ + (Y)!=HADDR_UNDEF && \ (X)<(Y)) -#define H5F_addr_le(X,Y) ((X)!=HADDR_UNDEF && \ - (Y)!=HADDR_UNDEF && \ +#define H5F_addr_le(X,Y) ((X)!=HADDR_UNDEF && \ + (Y)!=HADDR_UNDEF && \ (X)<=(Y)) -#define H5F_addr_gt(X,Y) ((X)!=HADDR_UNDEF && \ - (Y)!=HADDR_UNDEF && \ +#define H5F_addr_gt(X,Y) ((X)!=HADDR_UNDEF && \ + (Y)!=HADDR_UNDEF && \ (X)>(Y)) -#define H5F_addr_ge(X,Y) ((X)!=HADDR_UNDEF && \ - (Y)!=HADDR_UNDEF && \ +#define H5F_addr_ge(X,Y) ((X)!=HADDR_UNDEF && \ + (Y)!=HADDR_UNDEF && \ (X)>=(Y)) -#define H5F_addr_cmp(X,Y) (H5F_addr_eq((X), (Y)) ? 0 : \ +#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)) #define H5F_addr_overlap(O1,L1,O2,L2) (((O1) < (O2) && ((O1) + (L1)) > (O2)) || \ |