diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-09-25 21:11:52 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-09-25 21:11:52 (GMT) |
| commit | aa08db839e6aea89487be985704d57a0e424b21b (patch) | |
| tree | 51dbbee3efa3bc1a3f1bb2314202a5934d6f021c /src/H5public.h | |
| parent | cdc4b8a0fb55af4cf1a7bb4da5d8c4d454a0b8b6 (diff) | |
| parent | 571a5e9250ca69adb54ef956361a5cf77059f67c (diff) | |
| download | hdf5-aa08db839e6aea89487be985704d57a0e424b21b.zip hdf5-aa08db839e6aea89487be985704d57a0e424b21b.tar.gz hdf5-aa08db839e6aea89487be985704d57a0e424b21b.tar.bz2 | |
Merge pull request #2882 in HDFFV/hdf5 from ~BYRN/hdf5_adb:feature/cmakeV2-clang-format to develop
* commit '571a5e9250ca69adb54ef956361a5cf77059f67c':
Add h5ls test plugin format target
Fix manifest
Add code owners file
Update actions - split push/pull-request commits
Change to executable
Change to based on LLVM format
Fix comment formatting due to tabs conversion
Disable formatting for file
File changes to affect formatting
CMake and script changes for clang-format
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 ba2505a..249cc1d 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 |