diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2019-03-17 04:01:18 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@koziol.gov> | 2019-03-17 04:01:18 (GMT) |
| commit | cda6273737eda85398a110e9df73b67dc30722ab (patch) | |
| tree | a550007d120df30fecba97eda7460fcd837f8dc3 /src/H5Fprivate.h | |
| parent | 9d86314f8b71f090b71d7edec8014935f5cd3cc7 (diff) | |
| parent | f0d22e54c705285b10f8192be6b26ba1a7ae3fbc (diff) | |
| download | hdf5-cda6273737eda85398a110e9df73b67dc30722ab.zip hdf5-cda6273737eda85398a110e9df73b67dc30722ab.tar.gz hdf5-cda6273737eda85398a110e9df73b67dc30722ab.tar.bz2 | |
Merge remote-tracking branch 'origin/develop' into merge_hyperslab_update_01
Diffstat (limited to 'src/H5Fprivate.h')
| -rw-r--r-- | src/H5Fprivate.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h index 5f7a1b2..e3860a0 100644 --- a/src/H5Fprivate.h +++ b/src/H5Fprivate.h @@ -28,6 +28,7 @@ typedef struct H5F_t H5F_t; #include "H5FDpublic.h" /* File drivers */ /* Private headers needed by this file */ +#include "H5MMprivate.h" /* Memory management */ #ifdef H5_HAVE_PARALLEL #include "H5Pprivate.h" /* Property lists */ #endif /* H5_HAVE_PARALLEL */ @@ -134,7 +135,7 @@ typedef struct H5F_t H5F_t; \ HDcompile_assert(sizeof(double) == 8); \ HDcompile_assert(sizeof(double) == sizeof(uint64_t)); \ - HDmemcpy(&_n, &n, sizeof(double)); \ + H5MM_memcpy(&_n, &n, sizeof(double)); \ for(_u = 0; _u < sizeof(uint64_t); _u++, _n >>= 8) \ *_p++ = (uint8_t)(_n & 0xff); \ (p) = (uint8_t *)(p) + 8; \ @@ -240,7 +241,7 @@ typedef struct H5F_t H5F_t; (p) += 8; \ for(_u = 0; _u < sizeof(uint64_t); _u++) \ _n = (_n << 8) | *(--p); \ - HDmemcpy(&(n), &_n, sizeof(double)); \ + H5MM_memcpy(&(n), &_n, sizeof(double)); \ (p) += 8; \ } |