diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2021-04-01 20:14:21 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-01 20:14:21 (GMT) |
commit | 87d18137ceed7eae1ca7009dda6f4cf2841ff195 (patch) | |
tree | 291983f4bc5f9230bf53564e8555272319d382aa /.clang-format | |
parent | df75d35cc5295b03dc305ca7e5495fece5737d30 (diff) | |
download | hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.zip hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.tar.gz hdf5-87d18137ceed7eae1ca7009dda6f4cf2841ff195.tar.bz2 |
Hdf5 merge issue 487 v110 (#533)
* Cleans up a couple of MSVC warnings in testhdf5 (#475)
* Fixes a few testhdf5 warnings raised in Visual Studio
Visual Studio is grumpier about treating pointers like integers than
gcc.
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Fix typos and grammar errors. (#476)
* Suppresses the tcheck_version test's abort dialog on Windows (#477)
* Suppresses the tcheck_version test's abort dialog on Windows
Windows raises a modal abort/retry/ignore dialog box when CRT
calls abort(). This change installs a report hook that suppresses
the dialog so that the CMake tests don't time out waiting for a
nonexistent user to click a dialog box.
* Committing clang-format changes
* Removes __cdecl from callback
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Committing clang-format changes
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Diffstat (limited to '.clang-format')
-rw-r--r-- | .clang-format | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.clang-format b/.clang-format index 34b7563..62dc6b5 100644 --- a/.clang-format +++ b/.clang-format @@ -7,6 +7,7 @@ AlignConsecutiveDeclarations: true AlignConsecutiveMacros: true #llvm10-11: AlignOperands: true - Align #llvm11: AllowShortEnumsOnASingleLine: true +AllowShortFunctionsOnASingleLine: None AlwaysBreakAfterReturnType: AllDefinitions # Can enable the following section when llvm 12.x is out #AttributeMacros: @@ -32,6 +33,7 @@ BreakBeforeBraces: Stroustrup BreakAfterJavaFieldAnnotations: true BreakStringLiterals: true ColumnLimit: 110 # Update $max_trace_macro_line_len in bin/trace also +ForEachMacros: ['ALL_MEMBERS', 'UNIQUE_MEMBERS'] IncludeCategories: - Regex: '^"(llvm|llvm-c|clang|clang-c)/' Priority: 3 |