summaryrefslogtreecommitdiffstats
path: root/.clang-format
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-10-07 16:08:35 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-10-07 16:08:35 (GMT)
commit75567cbe8f6ec97df3db5b73f0c94625f63a4d0b (patch)
treeb34f6f0f71bed343775349fa98150315cf133150 /.clang-format
parentd1adf43852c29d9c81372a83b5ed2a5b943c5c6d (diff)
downloadhdf5-75567cbe8f6ec97df3db5b73f0c94625f63a4d0b.zip
hdf5-75567cbe8f6ec97df3db5b73f0c94625f63a4d0b.tar.gz
hdf5-75567cbe8f6ec97df3db5b73f0c94625f63a4d0b.tar.bz2
Merge from develop
github updates bin scripts updates parser changes remove obsolete file
Diffstat (limited to '.clang-format')
-rw-r--r--.clang-format5
1 files changed, 4 insertions, 1 deletions
diff --git a/.clang-format b/.clang-format
index 36f326d..4779a35 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,7 +12,7 @@ BraceWrapping:
BreakBeforeBraces: Stroustrup
BreakAfterJavaFieldAnnotations: true
BreakStringLiterals: true
-ColumnLimit: 110
+ColumnLimit: 110 # Update $max_trace_macro_line_len in bin/trace also
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 3
@@ -33,6 +33,8 @@ IncludeIsMainRegex: '(public)?$'
IndentCaseLabels: true
IndentGotoLabels: false
IndentWidth: 4
+MacroBlockBegin: "^BEGIN_FUNC"
+MacroBlockEnd: "^END_FUNC"
ObjCBlockIndentWidth: 4
ReflowComments: true
SortIncludes: false
@@ -58,5 +60,6 @@ StatementMacros:
- HMPI_GOTO_ERROR
- H5_GCC_DIAG_OFF
- H5_GCC_DIAG_ON
+ - CATCH
...