diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-06-04 21:52:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-04 21:52:36 (GMT) |
| commit | 9bf274e21a318b201a34b2d2e81a23f5c0bfecb2 (patch) | |
| tree | 6d8ae99974342c63611cf7ae308da81c256fa46e /src/H5public.h | |
| parent | 9041351328a4f0c806da56653c3c8abdda2ad222 (diff) | |
| download | hdf5-9bf274e21a318b201a34b2d2e81a23f5c0bfecb2.zip hdf5-9bf274e21a318b201a34b2d2e81a23f5c0bfecb2.tar.gz hdf5-9bf274e21a318b201a34b2d2e81a23f5c0bfecb2.tar.bz2 | |
Moves gcc warning macros from H5public.h to H5private.h (#724)
* Moves gcc warning suppression macros out of H5public.h
* Update RELEASE.txt
* Formatted source
Diffstat (limited to 'src/H5public.h')
| -rw-r--r-- | src/H5public.h | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/src/H5public.h b/src/H5public.h index b548889..bf81605 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -59,31 +59,6 @@ #endif #endif -/* Include the Windows API adapter header early */ -#include "H5api_adpt.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* Macros for enabling/disabling particular GCC warnings */ -/* (see the following web-sites for more info: - * http://www.dbp-consulting.com/tutorials/SuppressingGCCWarnings.html - * http://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas - */ -/* These pragmas are only implemented usefully in gcc 4.6+ */ -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 -#define H5_GCC_DIAG_JOINSTR(x, y) x y -#define H5_GCC_DIAG_DO_PRAGMA(x) _Pragma(#x) -#define H5_GCC_DIAG_PRAGMA(x) H5_GCC_DIAG_DO_PRAGMA(GCC diagnostic x) - -#define H5_GCC_DIAG_OFF(x) H5_GCC_DIAG_PRAGMA(push) H5_GCC_DIAG_PRAGMA(ignored H5_GCC_DIAG_JOINSTR("-W", x)) -#define H5_GCC_DIAG_ON(x) H5_GCC_DIAG_PRAGMA(pop) -#else -#define H5_GCC_DIAG_OFF(x) -#define H5_GCC_DIAG_ON(x) -#endif - /* Macro to hide a symbol from further preprocessor substitutions */ #define H5_NO_EXPAND(x) (x) @@ -368,6 +343,13 @@ typedef struct H5_alloc_stats_t { */ typedef void (*H5_atclose_func_t)(void *ctx); +/* API adapter header (defines H5_DLL, etc.) */ +#include "H5api_adpt.h" + +#ifdef __cplusplus +extern "C" { +#endif + /* Functions in H5.c */ /** * \ingroup H5 |