diff options
author | Quincey Koziol <koziol@koziol.gov> | 2019-04-03 22:27:10 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@koziol.gov> | 2019-04-03 22:27:10 (GMT) |
commit | fc945999d00fc66f3b6251115f8bc13d4b18814c (patch) | |
tree | 1751166c747d63296baac940ccef17ee0f3d8033 /src/H5VMprivate.h | |
parent | e6b8ebe95472fff931878beffe936edcacf5f122 (diff) | |
parent | 3d99a6a7937fdd67a0574b7025189ac6459a67d8 (diff) | |
download | hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.zip hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.gz hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.bz2 |
Merge remote-tracking branch 'origin/develop' into env_vol_load
Diffstat (limited to 'src/H5VMprivate.h')
-rw-r--r-- | src/H5VMprivate.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/H5VMprivate.h b/src/H5VMprivate.h index decac7e..26f59e2 100644 --- a/src/H5VMprivate.h +++ b/src/H5VMprivate.h @@ -21,6 +21,7 @@ /* Private headers needed by this file */ #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ +#include "H5MMprivate.h" /* Memory management */ /* Vector-Vector sequence operation callback */ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, @@ -41,7 +42,7 @@ typedef herr_t (*H5VM_opvv_func_t)(hsize_t dst_off, hsize_t src_off, /* Other functions */ #define H5VM_vector_cpy(N,DST,SRC) { \ HDassert(sizeof(*(DST))==sizeof(*(SRC))); \ - if (SRC) HDmemcpy (DST, SRC, (N)*sizeof(*(DST))); \ + if (SRC) H5MM_memcpy (DST, SRC, (N)*sizeof(*(DST))); \ else HDmemset (DST, 0, (N)*sizeof(*(DST))); \ } |