diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-30 14:28:21 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-30 14:28:21 (GMT) |
| commit | ca0c0c3dc83acb7261e607cfee3b3ef04d167188 (patch) | |
| tree | 6aa9407c7a4cb1bd10975205c14ff8b1ce3f0d5e /src/H5public.h | |
| parent | 636cba89e605644c8f094fcc7f951c70cd895a39 (diff) | |
| download | hdf5-ca0c0c3dc83acb7261e607cfee3b3ef04d167188.zip hdf5-ca0c0c3dc83acb7261e607cfee3b3ef04d167188.tar.gz hdf5-ca0c0c3dc83acb7261e607cfee3b3ef04d167188.tar.bz2 | |
Merge of clang-format changes from develop
Diffstat (limited to 'src/H5public.h')
| -rw-r--r-- | src/H5public.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/H5public.h b/src/H5public.h index 20c7102..21846f6 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -81,12 +81,11 @@ extern "C" { */ /* These pragmas are only implemented usefully in gcc 4.6+ */ #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 - #define H5_GCC_DIAG_STR(s) #s - #define H5_GCC_DIAG_JOINSTR(x,y) H5_GCC_DIAG_STR(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_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_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) @@ -182,10 +181,10 @@ typedef long long ssize_t; * type. */ #if H5_SIZEOF_LONG_LONG >= 8 -H5_GCC_DIAG_OFF(long-long) +H5_GCC_DIAG_OFF("long-long") typedef unsigned long long hsize_t; typedef signed long long hssize_t; -H5_GCC_DIAG_ON(long-long) +H5_GCC_DIAG_ON("long-long") # define H5_SIZEOF_HSIZE_T H5_SIZEOF_LONG_LONG # define H5_SIZEOF_HSSIZE_T H5_SIZEOF_LONG_LONG #else |