summaryrefslogtreecommitdiffstats
path: root/hl
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 /hl
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 'hl')
-rw-r--r--hl/tools/h5watch/swmr_check_compat_vfd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hl/tools/h5watch/swmr_check_compat_vfd.c b/hl/tools/h5watch/swmr_check_compat_vfd.c
index 070572c..87b87c4 100644
--- a/hl/tools/h5watch/swmr_check_compat_vfd.c
+++ b/hl/tools/h5watch/swmr_check_compat_vfd.c
@@ -24,7 +24,7 @@
#include "H5private.h"
/* This file needs to access the file driver testing code */
-#define H5FD_PACKAGE
+#define H5FD_FRIEND /*suppress error about including H5FDpkg */
#define H5FD_TESTING
#include "H5FDpkg.h" /* File drivers */