summaryrefslogtreecommitdiffstats
path: root/src/H5FDpkg.h
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-10-16 02:19:11 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-10-16 02:19:11 (GMT)
commit84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb (patch)
tree5680e556dbb0971024bcea8911beb7efebc184c1 /src/H5FDpkg.h
parent31683703d9bf394cef27805c50fc89efa29361b9 (diff)
downloadhdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.zip
hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.tar.gz
hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.tar.bz2
[svn-r28093] Merge of r27768 and r27774 from trunk
Description: Complete revamp of package initialization/shutdown mechanism in the library. Each package now has a single init/term routine. This new way should avoid packages being re-initialized during library shutdown and is also be _much_ more proactive about giving feedback for resource leaks internal to the library. Introduces a new "module" header file for packages in the library (e.g src/H5Fmodule.h) which sets up some necessary package configuration macros for the FUNC_ENTER/LEAVE macros. (The VFL drivers have their own slightly modified version of this header, src/H5FDdrvr_module.h) Also cleaned up a bunch of resources leaks all across the library and tests, along with addressing many warnings, as I encountered them. Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2 serial and parallel (MPICH 3.1.4)
Diffstat (limited to 'src/H5FDpkg.h')
-rw-r--r--src/H5FDpkg.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5FDpkg.h b/src/H5FDpkg.h
index d7f240e..45bcfd8 100644
--- a/src/H5FDpkg.h
+++ b/src/H5FDpkg.h
@@ -21,7 +21,7 @@
* the H5FD package. Source files outside the H5FD package should
* include H5FDprivate.h instead.
*/
-#ifndef H5FD_PACKAGE
+#if !(defined H5FD_FRIEND || defined H5FD_MODULE)
#error "Do not include this file outside the H5FD package!"
#endif
@@ -52,7 +52,6 @@
/******************************/
/* Package Private Prototypes */
/******************************/
-H5_DLL herr_t H5FD_init(void);
H5_DLL haddr_t H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type,
hsize_t size, haddr_t *align_addr, hsize_t *align_size);
H5_DLL herr_t H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type,