summaryrefslogtreecommitdiffstats
path: root/.clang-format
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2023-10-09 17:42:46 (GMT)
committerGitHub <noreply@github.com>2023-10-09 17:42:46 (GMT)
commit0feda66ff0dccdf77453b7c881c80be244e0ae12 (patch)
treec4a35a804bf18a5dac14aafae3f3e6e9281140ae /.clang-format
parent7b18845e9c24cc0d910fa082d3f5c7c92797396d (diff)
downloadhdf5-0feda66ff0dccdf77453b7c881c80be244e0ae12.zip
hdf5-0feda66ff0dccdf77453b7c881c80be244e0ae12.tar.gz
hdf5-0feda66ff0dccdf77453b7c881c80be244e0ae12.tar.bz2
Bring the H5detect removal change from develop (#3648)
* Bring the H5detect removal change from develop - Removed CMake cross-compiling variables * HDF5_USE_PREGEN * HDF5_BATCH_H5DETECT These were used to work around H5detect and H5make_libsettings and are no longer required. - Running H5make_libsettings is no longer required for cross-compiling The functionality of H5make_libsettings is now handled via template files, so H5make_libsettings has been removed. - Running H5detect is no longer required for cross-compiling The functionality of H5detect is now exercised at library startup, so H5detect has been removed. * Put H5T_CONV_ab macros in do..while loops (#3432) Ever since a recent round of macro cleanup, bin/trace and clang-format have been bickering over what H5Tconv.c should look like and neither produces readable code. This change puts the top-level H5T_CONV_ab macros in do..while loops, adds appropriate semicolons, and adds the missing H5_CLANG_DIAG_ON|OFF and H5_GCC_CLANG_DIAG_ON|OFF macros to the list of statement macros clang-format recognizes. H5Tconv.c is now readable and both bin/trace and clang-format are happy.
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format4
1 files changed, 4 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format
index 0d59087..0b62255 100644
--- a/.clang-format
+++ b/.clang-format
@@ -83,6 +83,10 @@ StatementMacros:
- H5_END_TAG
- H5_GCC_DIAG_OFF
- H5_GCC_DIAG_ON
+ - H5_CLANG_DIAG_OFF
+ - H5_CLANG_DIAG_ON
+ - H5_GCC_CLANG_DIAG_OFF
+ - H5_GCC_CLANG_DIAG_ON
- H5_LEAVE
- HGOTO_DONE
- HMPI_DONE_ERROR