From 55869bd2ff29dd92a49f155b5b0a6761449a18d8 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Fri, 27 Jun 2003 10:59:48 -0500 Subject: [svn-r7116] Purpose: Update code Description: Move "PABLO_MASK" definition above header file inclusion to avoid problems with inline functions in header files. Platforms tested: FreeBSD 4.8 (sleipnir) h5committest --- src/H5D.c | 7 ++++--- src/H5Dcompact.c | 5 ++++- src/H5Dcontig.c | 5 ++++- src/H5Dio.c | 7 ++++--- src/H5Distore.c | 5 ++++- src/H5Dseq.c | 5 ++++- src/H5Fcompact.c | 5 ++++- src/H5Fcontig.c | 5 ++++- src/H5Fistore.c | 5 ++++- src/H5Fseq.c | 5 ++++- src/H5ST.c | 6 +++++- src/H5Sall.c | 7 ++++--- src/H5Shyper.c | 7 ++++--- src/H5Snone.c | 7 ++++--- src/H5Spoint.c | 7 ++++--- src/H5Sselect.c | 7 ++++--- src/H5Stest.c | 7 ++++--- src/H5T.c | 6 ++++-- src/H5Tarray.c | 6 ++++-- src/H5Tbit.c | 6 ++++-- src/H5Tcommit.c | 6 ++++-- src/H5Tcompound.c | 6 ++++-- src/H5Tconv.c | 6 ++++-- src/H5Tnative.c | 6 ++++-- src/H5V.c | 5 ++++- 25 files changed, 101 insertions(+), 48 deletions(-) diff --git a/src/H5D.c b/src/H5D.c index 46622ff..ac8d965 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -14,6 +14,10 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ +/* 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 */ #include "H5Eprivate.h" /* Error handling */ @@ -37,9 +41,6 @@ #include "H5FDmpio.h" #include "H5FDmpiposix.h" -/* Pablo information */ -#define PABLO_MASK H5D_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT H5D_init_interface diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 829ba63..96e9955 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -22,6 +22,10 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fcompact_mask + #include "H5private.h" #include "H5Eprivate.h" #include "H5Fpkg.h" @@ -31,7 +35,6 @@ #include "H5Vprivate.h" /* Vector and array functions */ /* Interface initialization */ -#define PABLO_MASK H5Fcompact_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index d89b4b6..82ee74a 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -24,6 +24,10 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fcontig_mask + #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ @@ -47,7 +51,6 @@ H5F_contig_write(H5F_t *f, hsize_t max_data, haddr_t addr, const size_t size, hid_t dxpl_id, const void *buf); /* Interface initialization */ -#define PABLO_MASK H5Fcontig_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Dio.c b/src/H5Dio.c index fd4cef6..33ea366 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -14,6 +14,10 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Dio_mask + #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ @@ -40,9 +44,6 @@ # include "H5Rpublic.h" #endif /*H5_HAVE_PARALLEL*/ -/* Pablo information */ -#define PABLO_MASK H5Dio_mask - /* Local typedefs */ /* Information for mapping between file space and memory space */ diff --git a/src/H5Distore.c b/src/H5Distore.c index 1994767..4847948 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -43,6 +43,10 @@ #define H5B_PACKAGE /*suppress error about including H5Bpkg */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fistore_mask + #include "H5private.h" /* Generic Functions */ #include "H5Bpkg.h" /* B-link trees */ #include "H5Dprivate.h" /* Datasets */ @@ -89,7 +93,6 @@ /*#define H5F_ISTORE_DEBUG */ /* Interface initialization */ -#define PABLO_MASK H5Fistore_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Dseq.c b/src/H5Dseq.c index 0e29978..a007ebb 100644 --- a/src/H5Dseq.c +++ b/src/H5Dseq.c @@ -25,6 +25,10 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fseq_mask + #include "H5private.h" #include "H5Dprivate.h" #include "H5Eprivate.h" @@ -42,7 +46,6 @@ #include "H5FDmpiposix.h" /* Interface initialization */ -#define PABLO_MASK H5Fseq_mask #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Fcompact.c b/src/H5Fcompact.c index 829ba63..96e9955 100644 --- a/src/H5Fcompact.c +++ b/src/H5Fcompact.c @@ -22,6 +22,10 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fcompact_mask + #include "H5private.h" #include "H5Eprivate.h" #include "H5Fpkg.h" @@ -31,7 +35,6 @@ #include "H5Vprivate.h" /* Vector and array functions */ /* Interface initialization */ -#define PABLO_MASK H5Fcompact_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c index d89b4b6..82ee74a 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -24,6 +24,10 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fcontig_mask + #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ @@ -47,7 +51,6 @@ H5F_contig_write(H5F_t *f, hsize_t max_data, haddr_t addr, const size_t size, hid_t dxpl_id, const void *buf); /* Interface initialization */ -#define PABLO_MASK H5Fcontig_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 1994767..4847948 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -43,6 +43,10 @@ #define H5B_PACKAGE /*suppress error about including H5Bpkg */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fistore_mask + #include "H5private.h" /* Generic Functions */ #include "H5Bpkg.h" /* B-link trees */ #include "H5Dprivate.h" /* Datasets */ @@ -89,7 +93,6 @@ /*#define H5F_ISTORE_DEBUG */ /* Interface initialization */ -#define PABLO_MASK H5Fistore_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Fseq.c b/src/H5Fseq.c index 0e29978..a007ebb 100644 --- a/src/H5Fseq.c +++ b/src/H5Fseq.c @@ -25,6 +25,10 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Fseq_mask + #include "H5private.h" #include "H5Dprivate.h" #include "H5Eprivate.h" @@ -42,7 +46,6 @@ #include "H5FDmpiposix.h" /* Interface initialization */ -#define PABLO_MASK H5Fseq_mask #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5ST.c b/src/H5ST.c index 0fc55a6..e153bf6 100644 --- a/src/H5ST.c +++ b/src/H5ST.c @@ -17,11 +17,15 @@ 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 */ #include "H5STprivate.h" /* Ternary search trees */ -#define PABLO_MASK H5ST_mask +/* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Sall.c b/src/H5Sall.c index ea6d6b1..01e0077 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -21,15 +21,16 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Sall_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* ID Functions */ #include "H5Spkg.h" /* Dataspace functions */ #include "H5Vprivate.h" /* Vector functions */ -/* Pablo mask */ -#define PABLO_MASK H5Sall_mask - /* Interface initialization */ #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 0635f1e..f3640ac 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -21,6 +21,10 @@ #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 */ #include "H5FLprivate.h" /* Free Lists */ @@ -28,9 +32,6 @@ #include "H5Spkg.h" /* Dataspace functions */ #include "H5Vprivate.h" /* Vector functions */ -/* Pablo mask */ -#define PABLO_MASK H5Shyper_mask - /* Interface initialization */ #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Snone.c b/src/H5Snone.c index 7d1aa12..24dfb34 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -21,6 +21,10 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Snone_mask + #include "H5private.h" #include "H5Eprivate.h" #include "H5Iprivate.h" @@ -28,9 +32,6 @@ #include "H5Vprivate.h" #include "H5Dprivate.h" -/* Pablo mask */ -#define PABLO_MASK H5Snone_mask - /* Interface initialization */ #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 8da8884..00ae708 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -21,6 +21,10 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Spoint_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5FLprivate.h" /* Free Lists */ @@ -29,9 +33,6 @@ #include "H5Spkg.h" /* Dataspace functions */ #include "H5Vprivate.h" /* Vector functions */ -/* Pablo mask */ -#define PABLO_MASK H5Spoint_mask - /* Interface initialization */ #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Sselect.c b/src/H5Sselect.c index b128e63..b451ce7 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -20,6 +20,10 @@ #define H5S_PACKAGE /*suppress error about including H5Spkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Sselect_mask + #include "H5private.h" /* Generic Functions */ #include "H5Dprivate.h" /* Datasets (for their properties) */ #include "H5Eprivate.h" /* Error handling */ @@ -28,9 +32,6 @@ #include "H5Spkg.h" /* Dataspace functions */ #include "H5Vprivate.h" /* Vector functions */ -/* Pablo mask */ -#define PABLO_MASK H5Sselect_mask - /* Interface initialization */ #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5Stest.c b/src/H5Stest.c index bbb21d6..9062565 100644 --- a/src/H5Stest.c +++ b/src/H5Stest.c @@ -21,14 +21,15 @@ #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 H5Stest_mask + #include "H5private.h" /* Generic Functions */ #include "H5Eprivate.h" /* Error handling */ #include "H5Iprivate.h" /* ID Functions */ #include "H5Spkg.h" /* Dataspace functions */ -/* Pablo mask */ -#define PABLO_MASK H5Stest_mask - /* Interface initialization */ #define INTERFACE_INIT NULL static int interface_initialize_g = 0; diff --git a/src/H5T.c b/src/H5T.c index 7054958..01752cc 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -21,6 +21,10 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* 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) */ #include "H5Eprivate.h" /*error handling */ @@ -31,8 +35,6 @@ #include "H5Pprivate.h" /* Property Lists */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5T_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT H5T_init_interface diff --git a/src/H5Tarray.c b/src/H5Tarray.c index 46dc4a0..5d1dc9b 100644 --- a/src/H5Tarray.c +++ b/src/H5Tarray.c @@ -19,14 +19,16 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Tarray_mask + #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ #include "H5FLprivate.h" /*Free Lists */ #include "H5Iprivate.h" /*ID functions */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5Tarray_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT H5T_init_array_interface diff --git a/src/H5Tbit.c b/src/H5Tbit.c index ece0d51..f2ad5f1 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -20,13 +20,15 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Tbit_mask + #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ #include "H5Iprivate.h" /*ID functions */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5Tbit_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT NULL diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 831c580..3cbb156 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -19,13 +19,15 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Tcommit_mask + #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ #include "H5Iprivate.h" /*ID functions */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5Tcommit_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT H5T_init_commit_interface diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index 6621c7e..b13788f 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -19,14 +19,16 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Tcompound_mask + #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ #include "H5Iprivate.h" /*ID functions */ #include "H5MMprivate.h" /*memory management */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5Tcompound_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT H5T_init_compound_interface diff --git a/src/H5Tconv.c b/src/H5Tconv.c index b230344..44dde72 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -18,6 +18,10 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Tconv_mask + #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ #include "H5FLprivate.h" /*Free Lists */ @@ -26,8 +30,6 @@ #include "H5Pprivate.h" /* Property Lists */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5Tconv_mask - /* Conversion data for H5T_conv_struct() */ typedef struct H5T_conv_struct_t { int *src2dst; /*mapping from src to dst member num */ diff --git a/src/H5Tnative.c b/src/H5Tnative.c index 92e5b02..c05b8aa 100644 --- a/src/H5Tnative.c +++ b/src/H5Tnative.c @@ -19,6 +19,10 @@ #define H5T_PACKAGE /*suppress error about including H5Tpkg */ +/* Pablo information */ +/* (Put before include files to avoid problems with inline functions) */ +#define PABLO_MASK H5Tnative_mask + #include "H5private.h" /*generic functions */ #include "H5Eprivate.h" /*error handling */ #include "H5Iprivate.h" /*ID functions */ @@ -26,8 +30,6 @@ #include "H5MMprivate.h" /*memory management */ #include "H5Tpkg.h" /*data-type functions */ -#define PABLO_MASK H5Tnative_mask - /* Interface initialization */ static int interface_initialize_g = 0; #define INTERFACE_INIT H5T_init_native_interface diff --git a/src/H5V.c b/src/H5V.c index 1d5fd0a..598ef93 100644 --- a/src/H5V.c +++ b/src/H5V.c @@ -17,13 +17,16 @@ * 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" #include "H5Oprivate.h" #include "H5Vprivate.h" #define H5V_HYPER_NDIMS H5O_LAYOUT_NDIMS -#define PABLO_MASK H5V_mask static int interface_initialize_g = 0; #define INTERFACE_INIT NULL -- cgit v0.12