summaryrefslogtreecommitdiffstats
path: root/src/H5public.h
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-04-01 23:29:24 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-04-01 23:29:24 (GMT)
commit6986211d6584792ca48cb2469d0e779c445638d2 (patch)
tree6c2c9158d8c1e69d2c3e338192da0cb7c8d58182 /src/H5public.h
parentad4154cdc89ddf15691dbfe1c609898ef484808b (diff)
downloadhdf5-6986211d6584792ca48cb2469d0e779c445638d2.zip
hdf5-6986211d6584792ca48cb2469d0e779c445638d2.tar.gz
hdf5-6986211d6584792ca48cb2469d0e779c445638d2.tar.bz2
[svn-r26703] Merge of r26392 from trunk.
Adds new memory allocation functions that use the library's memory allocator. Intended for use with third-party filter code. Tested on: h5committest, Solaris (emu), OS X (quail) Note: emu fails with the existing Inf/inf case problem in h5dump but no other tests fail.
Diffstat (limited to 'src/H5public.h')
-rw-r--r--src/H5public.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/H5public.h b/src/H5public.h
index 2987133..fb73ed6 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -332,6 +332,8 @@ H5_DLL herr_t H5get_libversion(unsigned *majnum, unsigned *minnum,
H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum,
unsigned relnum);
H5_DLL herr_t H5free_memory(void *mem);
+H5_DLL void *H5allocate_memory(size_t size, hbool_t clear);
+H5_DLL void *H5resize_memory(void *mem, size_t size);
#ifdef __cplusplus
}