Merge branch 'main' of github.com:opendocument-app/OpenDocument.core …

…into refactor/document-tree
opendocument-app · Nov 25, 2023 · 8ae1387 · 8ae1387
2 parents a7d6fd3 + 0ec7907
commit 8ae1387
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -11,14 +11,16 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - run: clang-format --version
+      - run: sudo apt install clang-format-15
+
+      - run: clang-format-15 --version
 
       - name: checkout
         uses: actions/checkout@v2
 
       - name: apply clang-format
         run: |
           FILES=$( find . -type f \( -iname \*.h -o -iname \*.cpp \) )
-          clang-format-12 --style=file -i $FILES
+          clang-format-15 --style=file -i $FILES
 
       - run: git diff --exit-code --name-only
diff --git a/src/odr/internal/csv/csv_util.cpp b/src/odr/internal/csv/csv_util.cpp
@@ -18,8 +18,7 @@ void csv::check_csv_file(std::istream &in) {
   auto parser = ::csv::parse(util::stream::read(in), format);
 
   // this will actually check `variable_columns`
-  for (auto &&_ : parser) {
-    (void)_;
+  for ([[maybe_unused]] auto &&_ : parser) {
   }
 
   if (parser.get_col_names().size() <= 1) {

diff --git a/src/odr/internal/json/json_util.cpp b/src/odr/internal/json/json_util.cpp
@@ -6,8 +6,7 @@ namespace odr::internal {
 
 void json::check_json_file(std::istream &in) {
   // TODO limit check size
-  auto _ = nlohmann::json::parse(in);
-  (void)_;
+  (void)nlohmann::json::parse(in);
   // TODO check if that even works
 }