Skip to content

Commit f2fab65

Browse files
jose-luis-rsmorze00
andcommitted
feat(clang-format):Update to clang-format-16
Co-authored-by: morze00 <v.panin@gsi.de>
1 parent bae9bfc commit f2fab65

4 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/static_analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
run: |
2424
cd $GITHUB_WORKSPACE
2525
sudo apt-get update
26-
sudo apt-get install clang-format-15
27-
./util/clang-format-check.sh clang-format-15
26+
sudo apt-get install clang-format-16
27+
./util/clang-format-check.sh clang-format-16
2828
shell: bash
2929

3030
clang-tidy:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Please ask your questions, request features, and report issues by [creating a gi
8686

8787
## Code Formatting
8888

89-
The R3BRoot project uses clang-format-15 to ensure a common code formatting. The script "clang-format-all.sh" can be used for this purpose:
89+
The R3BRoot project uses clang-format-16 to ensure a common code formatting. The script "clang-format-all.sh" can be used for this purpose:
9090
~~~bash
9191
source util/clang-format-all.sh
9292
~~~

r3bsource/wr/R3BWhiterabbitReaderImpl.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,7 @@
8585
return kTRUE; \
8686
} \
8787
\
88-
void R3B##ClassName##Reader::Reset() \
89-
{ \
90-
fNEvent = 0; \
91-
} \
88+
void R3B##ClassName##Reader::Reset() { fNEvent = 0; } \
9289
\
9390
ClassImp(R3B##ClassName##Reader)
9491

util/clang-format-all.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
23
find . -type f \( -name "*.cpp" -o -name "*.cxx" -o -name "*.C" -o -name "*.h" \) \
34
! -path "./macros" ! -path "./sofia" ! -path "./frs" ! -path "./asyeos" ! -path "./glad-tpc" -print0 |
4-
xargs -0 -L 1 clang-format-15 -i
5+
xargs -0 -L 1 clang-format-16 -i
56

67
echo "Use git add -A ; git commit -m \"clang-format all files\" --author=\"white space <whitespace@example.com>\" to commit changes."

0 commit comments

Comments
 (0)