diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2005-01-20 22:50:40 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2005-01-20 22:50:40 (GMT) |
| commit | 2cd3b4c609eb07baaa0f795983fd2ac85a7d9579 (patch) | |
| tree | d49d88116f2ab7c165a9b67f31c00d966b2c7845 /src | |
| parent | e4394cd2fb18ed8ca6f38dc3d8fb534a24a289c4 (diff) | |
| download | hdf5-2cd3b4c609eb07baaa0f795983fd2ac85a7d9579.zip hdf5-2cd3b4c609eb07baaa0f795983fd2ac85a7d9579.tar.gz hdf5-2cd3b4c609eb07baaa0f795983fd2ac85a7d9579.tar.bz2 | |
[svn-r9852] Purpose: Maintenance
Description: Removed PABLO instrumentation from HDF5 source
Solution:
Platforms tested: arabica, copper (parallel), mir
Misc. update:
Diffstat (limited to 'src')
105 files changed, 1 insertions, 304 deletions
@@ -16,7 +16,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5_mask #include "H5private.h" /* Generic Functions */ #include "H5Bprivate.h" /* B-link trees */ @@ -17,9 +17,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5A_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5A_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ @@ -49,7 +49,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5AC_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ @@ -102,7 +102,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5B_mask /* private headers */ #include "H5private.h" /* Generic Functions */ @@ -85,7 +85,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5C_mask #include "H5private.h" /* Generic Functions */ #include "H5Cprivate.h" /* Cache */ @@ -19,7 +19,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5D_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 8a032e3..3ce7caf 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -24,7 +24,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Dcompact_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 18c6677..7c8b553 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -26,7 +26,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Dcontig_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ diff --git a/src/H5Defl.c b/src/H5Defl.c index 3a7b079..adf5124 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -21,7 +21,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5D_efl_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ diff --git a/src/H5Dio.c b/src/H5Dio.c index 03cbf9d..6616483 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -16,7 +16,6 @@ /* Pablo information */ /* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5D_io_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ diff --git a/src/H5Distore.c b/src/H5Distore.c index 96d5a46..9b75ca4 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -43,9 +43,6 @@ #define H5B_PACKAGE /*suppress error about including H5Bpkg */ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Distore_mask #include "H5private.h" /* Generic Functions */ #include "H5Bpkg.h" /* B-link trees */ diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 9d1f65c..976f282 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -24,9 +24,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5D_mpio_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ diff --git a/src/H5Dselect.c b/src/H5Dselect.c index a12823e..125d22f 100644 --- a/src/H5Dselect.c +++ b/src/H5Dselect.c @@ -20,9 +20,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5D_select_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ diff --git a/src/H5Dtest.c b/src/H5Dtest.c index c155e95..24817a8 100644 --- a/src/H5Dtest.c +++ b/src/H5Dtest.c @@ -21,9 +21,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ #define H5D_TESTING /*suppress warning about H5D testing funcs*/ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Dtest_mask #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ @@ -43,9 +43,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5E_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5E_mask #include "H5private.h" /* Generic Functions */ #include "H5Iprivate.h" /* IDs */ @@ -17,9 +17,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5F_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5F_mask /* Packages needed by this file... */ #include "H5private.h" /* Generic Functions */ @@ -28,9 +28,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_mask /* Packages needed by this file */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 1b3d877..11d5cd3 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -24,9 +24,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_core_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_core_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index 2e05203..83fe5a2 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -36,9 +36,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_family_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_family_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDgass.c b/src/H5FDgass.c index 9da489c..e0e2a42 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -23,9 +23,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_gass_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_gass_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDlog.c b/src/H5FDlog.c index 541baaa..91914ee 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -28,9 +28,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_log_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_log_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c index e738a82..671eccb 100644 --- a/src/H5FDmpi.c +++ b/src/H5FDmpi.c @@ -20,9 +20,6 @@ * */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_mpi_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 9d5c48a..f46bf9e 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -23,9 +23,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_mpio_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_mpio_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c index 6500a85..de5c444 100644 --- a/src/H5FDmpiposix.c +++ b/src/H5FDmpiposix.c @@ -35,9 +35,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_mpiposix_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_mpiposix_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 94babea..2229853 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -27,9 +27,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_sec2_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_sec2_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c index f739500..15faa15 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_srb_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_srb_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5FDstream.c b/src/H5FDstream.c index 5e02623..455b3ff 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FD_stream_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FD_stream_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ @@ -29,9 +29,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5FL_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FL_mask /* #define H5FL_DEBUG */ @@ -22,9 +22,6 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FO_mask #include "H5Eprivate.h" /* Error handling */ #include "H5Fpkg.h" /* File access */ @@ -26,9 +26,6 @@ * */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5FS_mask #include "H5private.h" /* Generic Functions */ #include "H5FSprivate.h" /* Private function stack routines */ diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c index b14d580..ee42963 100644 --- a/src/H5Fdbg.c +++ b/src/H5Fdbg.c @@ -20,9 +20,6 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Fdbg_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ @@ -91,9 +91,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5G_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5G_mask /* Packages needed by this file... */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Gent.c b/src/H5Gent.c index 4aaaf70..69a34f8 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -19,9 +19,6 @@ #define H5G_PACKAGE #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5G_ent_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Gnode.c b/src/H5Gnode.c index 72893cd..1f2e94f 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -30,9 +30,6 @@ #define H5G_PACKAGE /*suppress error message about including H5Gpkg.h */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5G_node_mask /* Packages needed by this file... */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Gstab.c b/src/H5Gstab.c index 71b5603..383623d 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -19,9 +19,6 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5G_PACKAGE /*suppress error about including H5Gpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5G_stab_mask #include "H5private.h" #include "H5Eprivate.h" @@ -39,9 +39,6 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5HG_PACKAGE /*suppress error about including H5HGpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5HG_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c index 68a3e85..4444fdb 100644 --- a/src/H5HGdbg.c +++ b/src/H5HGdbg.c @@ -19,9 +19,6 @@ */ #define H5HG_PACKAGE /*suppress error about including H5HGpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5HGdbg_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ @@ -31,9 +31,6 @@ #define H5F_PACKAGE /* Suppress error about including H5Fpkg */ #define H5HL_PACKAGE /* Suppress error about including H5HLpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5HL_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c index aefa7c1..e2e4978 100644 --- a/src/H5HLdbg.c +++ b/src/H5HLdbg.c @@ -19,9 +19,6 @@ */ #define H5HL_PACKAGE /* Suppress error about including H5HLpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5HLdbg_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ @@ -20,9 +20,6 @@ * */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5HP_mask /* Private headers needed */ #include "H5private.h" /* Generic Functions */ @@ -37,9 +37,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5I_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5I_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ @@ -32,9 +32,6 @@ */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5MF_mask #include "H5private.h" #include "H5Eprivate.h" @@ -25,9 +25,6 @@ *------------------------------------------------------------------------- */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5MM_mask #include "H5private.h" #include "H5Eprivate.h" @@ -31,9 +31,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5O_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5O_mask #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 4487985..be48782 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -16,9 +16,6 @@ #define H5O_PACKAGE /*suppress error about including H5Opkg */ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5O_attr_mask #include "H5private.h" /* Generic Functions */ #include "H5Apkg.h" /* Attributes */ diff --git a/src/H5Obogus.c b/src/H5Obogus.c index 63b002b..4da3f89 100644 --- a/src/H5Obogus.c +++ b/src/H5Obogus.c @@ -37,7 +37,6 @@ #include "H5Opkg.h" /* Object header functions */ #ifdef H5O_ENABLE_BOGUS -#define PABLO_MASK H5O_bogus_mask /* PRIVATE PROTOTYPES */ static void *H5O_bogus_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); diff --git a/src/H5Ocont.c b/src/H5Ocont.c index 79da2f7..23c501e 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -36,7 +36,6 @@ #include "H5MMprivate.h" #include "H5Opkg.h" /* Object header functions */ -#define PABLO_MASK H5O_cont_mask /* PRIVATE PROTOTYPES */ static void *H5O_cont_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 3df93b9..d627ac3 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -23,7 +23,6 @@ #include "H5Opkg.h" /* Object headers */ #include "H5Tpkg.h" /* Datatypes */ -#define PABLO_MASK H5O_dtype_mask /* PRIVATE PROTOTYPES */ static herr_t H5O_dtype_encode (H5F_t *f, uint8_t *p, const void *mesg); diff --git a/src/H5Oefl.c b/src/H5Oefl.c index 2e8e365..974b86f 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -19,9 +19,6 @@ #define H5O_PACKAGE /*suppress error about including H5Opkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5O_efl_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Ofill.c b/src/H5Ofill.c index 8599d82..73f60a7 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -29,7 +29,6 @@ #include "H5Opkg.h" /* Object header functions */ #include "H5Pprivate.h" /* Property lists */ -#define PABLO_MASK H5O_fill_mask static void *H5O_fill_new_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); static herr_t H5O_fill_new_encode(H5F_t *f, uint8_t *p, const void *_mesg); diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 00fd2ab..11ef9f4 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -20,9 +20,6 @@ #define H5O_PACKAGE /*suppress error about including H5Opkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5O_layout_mask #include "H5private.h" #include "H5Dprivate.h" diff --git a/src/H5Omtime.c b/src/H5Omtime.c index a6cc127..ad398ae 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -31,7 +31,6 @@ #include <sys/timeb.h> #endif -#define PABLO_MASK H5O_mtime_mask static void *H5O_mtime_new_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); static herr_t H5O_mtime_new_encode(H5F_t *f, uint8_t *p, const void *_mesg); diff --git a/src/H5Oname.c b/src/H5Oname.c index a675eff..e76e3a8 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -32,8 +32,6 @@ #include "H5MMprivate.h" #include "H5Opkg.h" /* Object header functions */ -#define PABLO_MASK H5O_name_mask - /* PRIVATE PROTOTYPES */ static void *H5O_name_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); static herr_t H5O_name_encode(H5F_t *f, uint8_t *p, const void *_mesg); diff --git a/src/H5Onull.c b/src/H5Onull.c index bcf3da3..69bee7d 100644 --- a/src/H5Onull.c +++ b/src/H5Onull.c @@ -30,8 +30,6 @@ #include "H5private.h" #include "H5Opkg.h" /* Object header functions */ -#define PABLO_MASK H5O_null_mask - /* This message derives from H5O */ const H5O_class_t H5O_NULL[1] = {{ H5O_NULL_ID, /*message id number */ diff --git a/src/H5Opline.c b/src/H5Opline.c index 1fa304f..7c1dba6f 100644 --- a/src/H5Opline.c +++ b/src/H5Opline.c @@ -27,8 +27,6 @@ #include "H5MMprivate.h" #include "H5Opkg.h" /* Object header functions */ -/* Pablo mask */ -#define PABLO_MASK H5O_pline_mask #define H5O_PLINE_VERSION 1 diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 1b2e351..acf177e 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -23,7 +23,6 @@ #include "H5Opkg.h" /* Object header functions */ #include "H5Spkg.h" -#define PABLO_MASK H5O_sdspace_mask /* PRIVATE PROTOTYPES */ static void *H5O_sdspace_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 2f30ae6..8f4f558 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -28,9 +28,6 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ #define H5O_PACKAGE /*suppress error about including H5Opkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5O_shared_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Ostab.c b/src/H5Ostab.c index e880694..b3a3fd5 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -35,7 +35,6 @@ #include "H5MMprivate.h" /* Memory management */ #include "H5Opkg.h" /* Object headers */ -#define PABLO_MASK H5O_stab_mask /* PRIVATE PROTOTYPES */ static void *H5O_stab_decode(H5F_t *f, hid_t dxpl_id, const uint8_t *p, H5O_shared_t *sh); @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5P_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5P_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index f249901..00fef64 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -14,9 +14,6 @@ #define H5P_PACKAGE /*suppress error about including H5Ppkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5P_dcpl_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index 3b8d12f..6d09a9e 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -14,9 +14,6 @@ #define H5P_PACKAGE /*suppress error about including H5Ppkg */ -/* Pablo mask */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5P_dxpl_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 89a9004..cf7a964 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -14,9 +14,6 @@ #define H5P_PACKAGE /*suppress error about including H5Ppkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5P_fapl_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index 76ca4ed..90ed7f7 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -14,9 +14,6 @@ #define H5P_PACKAGE /*suppress error about including H5Ppkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5P_fcpl_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ diff --git a/src/H5Ptest.c b/src/H5Ptest.c index f92ee48..0076047 100644 --- a/src/H5Ptest.c +++ b/src/H5Ptest.c @@ -21,9 +21,6 @@ #define H5P_PACKAGE /*suppress error about including H5Ppkg */ #define H5P_TESTING /*suppress warning about H5P testing funcs*/ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5P_test_mask /* Private header files */ #include "H5private.h" /* Generic Functions */ @@ -17,9 +17,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5R_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5R_mask #include "H5private.h" /* Generic Functions */ #include "H5Iprivate.h" /* ID Functions */ @@ -19,9 +19,6 @@ * */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5RC_mask #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free lists */ @@ -19,9 +19,6 @@ * */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5RS_mask #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free lists */ @@ -17,9 +17,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5S_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_mask #define _H5S_IN_H5S_C #include "H5private.h" /* Generic Functions */ @@ -40,9 +40,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5SL_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5SL_mask /* Private headers needed */ #include "H5private.h" /* Generic Functions */ @@ -17,9 +17,6 @@ Bentley and Robert Sedgewick in the April, 1998, Dr. Dobb's Journal. */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5ST_mask #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free lists */ diff --git a/src/H5Sall.c b/src/H5Sall.c index 5472d42..eb4c4c8 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -21,9 +21,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_all_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Shyper.c b/src/H5Shyper.c index eb25a8c..1ea4100 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -21,9 +21,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Shyper_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Smpio.c b/src/H5Smpio.c index da285cd..121eac6 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -23,9 +23,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_mpio_mask #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Datasets */ diff --git a/src/H5Snone.c b/src/H5Snone.c index 2cc2a1e..b50af6a 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -21,9 +21,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_none_mask #include "H5private.h" #include "H5Eprivate.h" diff --git a/src/H5Spoint.c b/src/H5Spoint.c index a79bea7..7a260a5 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -21,9 +21,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_point_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 1d9e68e..f7a58d3 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -20,9 +20,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_select_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Stest.c b/src/H5Stest.c index 7580a0f..2eef919 100644 --- a/src/H5Stest.c +++ b/src/H5Stest.c @@ -21,9 +21,6 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ #define H5S_TESTING /*suppress warning about H5S testing funcs*/ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5S_test_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ @@ -24,9 +24,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_mask #include "H5private.h" /*generic functions */ #include "H5Dprivate.h" /*datasets (for H5Tcopy) */ diff --git a/src/H5Tarray.c b/src/H5Tarray.c index 73675a7..b33d3bf 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_array_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_array_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Tbit.c b/src/H5Tbit.c index 440d8d1..087a927 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -20,9 +20,6 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_bit_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 26054d0..22b8b50 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_commit_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_commit_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index 467798f..46b1773 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_compound_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_compound_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 2cdfb2e..65ce7e4 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -18,9 +18,6 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_conv_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tcset.c b/src/H5Tcset.c index 5d9c857..1c86b96 100644 --- a/src/H5Tcset.c +++ b/src/H5Tcset.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_cset_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_cset_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tenum.c b/src/H5Tenum.c index db1daa4..10870d7 100644 --- a/src/H5Tenum.c +++ b/src/H5Tenum.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_enum_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_enum_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tfields.c b/src/H5Tfields.c index d2c2082..813690c 100644 --- a/src/H5Tfields.c +++ b/src/H5Tfields.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_fields_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_fields_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c index 99fc26a..4219377 100644 --- a/src/H5Tfixed.c +++ b/src/H5Tfixed.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_fixed_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_fixed_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c index 6be73da..dbf0cb0 100644 --- a/src/H5Tfloat.c +++ b/src/H5Tfloat.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_float_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_float_mask #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 291c41b..1ffa45b 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_native_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_native_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Toffset.c b/src/H5Toffset.c index 99046cf..6090851 100644 --- a/src/H5Toffset.c +++ b/src/H5Toffset.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_offset_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_offset_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Topaque.c b/src/H5Topaque.c index 0bfed4b..58535a2 100644 --- a/src/H5Topaque.c +++ b/src/H5Topaque.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_opaque_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_opaque_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Torder.c b/src/H5Torder.c index c43fc3c..6d9a713 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_order_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_order_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Tpad.c b/src/H5Tpad.c index 254831e..3a59bca 100644 --- a/src/H5Tpad.c +++ b/src/H5Tpad.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_pad_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_pad_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c index 9728172..c597848 100644 --- a/src/H5Tprecis.c +++ b/src/H5Tprecis.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_precis_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_precis_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c index c79b60d..1c8ce2f 100644 --- a/src/H5Tstrpad.c +++ b/src/H5Tstrpad.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_strpad_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_strpad_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index b20b0b3..081ba68 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -22,9 +22,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5T_init_vlen_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5T_vlen_mask #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Dataset functions */ @@ -17,9 +17,6 @@ * Friday, October 10, 1997 */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5V_mask #include "H5private.h" #include "H5Eprivate.h" @@ -17,9 +17,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5Z_init_interface -/* Pablo mask */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Z_mask #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Dataset functions */ diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 3202221..dd752ae 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -19,9 +19,6 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Z_deflate_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c index dfd69cf..0bd876d 100644 --- a/src/H5Zfletcher32.c +++ b/src/H5Zfletcher32.c @@ -19,9 +19,6 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Z_fletcher32_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c index 36b6f23..9bf4ac0 100644 --- a/src/H5Zshuffle.c +++ b/src/H5Zshuffle.c @@ -14,9 +14,6 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Z_shuffle_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Zszip.c b/src/H5Zszip.c index 79fc721..662429b 100644 --- a/src/H5Zszip.c +++ b/src/H5Zszip.c @@ -14,9 +14,6 @@ #define H5Z_PACKAGE /*suppress error about including H5Zpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ -#define PABLO_MASK H5Z_szip_mask #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5detect.c b/src/H5detect.c index cb71cf8..b79911d 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -499,7 +499,6 @@ print_results(int nd, detected_t *d, int na, malign_t *misc_align) /* Include files */ printf("\ #define H5T_PACKAGE /*suppress error about including H5Tpkg.h*/\n\ -#define PABLO_MASK H5T_init_mask\n\ \n\ #include \"H5private.h\"\n\ #include \"H5Iprivate.h\"\n\ diff --git a/src/H5private.h b/src/H5private.h index 69b5e6e..2acdf6c 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -159,16 +159,6 @@ #endif /* - * Pablo support files. - */ -#ifdef H5_HAVE_PABLO -# define IOTRACE -# define HDFIOTRACE -# include "HDFIOTrace.h" -# include "ProcIDs.h" -#endif - -/* * MPE Instrumentation support * Do not #if the following header file because it contains * the needed null definitions for the H5-MPE macros when MPE @@ -1141,8 +1131,6 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); #define FUNC_ENTER_COMMON_NOFUNC(func_name,asrt) \ - PABLO_SAVE (ID_ ## func_name) \ - \ /* Check API status */ \ assert(asrt); \ \ @@ -1150,7 +1138,6 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); H5_CHECK_FUNCNAME(func_name); \ \ /* Start tracing */ \ - PABLO_TRACE_ON (PABLO_MASK, pablo_func_id) #define FUNC_ENTER_COMMON(func_name,asrt) \ static const char FUNC[]=#func_name; \ @@ -1301,12 +1288,12 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); * The pablo mask comes from the constant PABLO_MASK defined on a * per-file basis. The pablo_func_id comes from an auto variable * defined by FUNC_ENTER. + * PABLO was removed on January 20, 2005 EIP * *------------------------------------------------------------------------- */ #define FUNC_LEAVE_API(ret_value) \ FINISH_MPE_LOG; \ - PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \ H5TRACE_RETURN(ret_value); \ H5_POP_FUNC; \ FUNC_LEAVE_API_THREADSAFE \ @@ -1315,14 +1302,12 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); }} /*end scope from beginning of FUNC_ENTER*/ #define FUNC_LEAVE_NOAPI(ret_value) \ - PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \ H5_POP_FUNC; \ return (ret_value); \ } /*end scope from end of FUNC_ENTER*/ \ } /*end scope from beginning of FUNC_ENTER*/ #define FUNC_LEAVE_NOAPI_VOID \ - PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \ H5_POP_FUNC; \ return; \ } /*end scope from end of FUNC_ENTER*/ \ @@ -1334,24 +1319,10 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); * (so far, just the H5FS routines themselves) */ #define FUNC_LEAVE_NOAPI_NOFS(ret_value) \ - PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \ return (ret_value); \ } /*end scope from end of FUNC_ENTER*/ \ } /*end scope from beginning of FUNC_ENTER*/ -/* - * The FUNC_ENTER() and FUNC_LEAVE() macros make calls to Pablo functions - * through one of these two sets of macros. - */ -#ifdef H5_HAVE_PABLO -# define PABLO_SAVE(func_id) const int pablo_func_id = func_id; -# define PABLO_TRACE_ON(m, f) TRACE_ON(m,f) -# define PABLO_TRACE_OFF(m, f) TRACE_OFF(m,f) -#else -# define PABLO_SAVE(func_id) /*void */ -# define PABLO_TRACE_ON(m, f) /*void */ -# define PABLO_TRACE_OFF(m, f) /*void */ -#endif /* Macro for "glueing" together items, for re-scanning macros */ #define H5_GLUE(x,y) x##y diff --git a/src/hdf5.lnt b/src/hdf5.lnt index f8d4347..770b5a7 100755 --- a/src/hdf5.lnt +++ b/src/hdf5.lnt @@ -36,8 +36,6 @@ -esym(534, H5RC_decr) -esym(534, H5V_array_fill) -// Turn off warnings about not using PABLO_MASK macro --esym(750, PABLO_MASK) // Turn off warnings about "Expression-like macro not parenthesized" for // enumerated type increment & decrement macros: |