From f482fba8e55fd1f12dfc7e431d534c063833f2a0 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Thu, 9 May 2024 11:16:40 -0400
Subject: [PATCH] Re-format with clang-format 16

Change-Id: I5ea29c62b4fb8be6cd00acae8e75b4fa6c292325
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12536
Tested-by: Philippe Proulx <eeppeliteloop@gmail.com>
---
 src/cpp-common/bt2c/logging.hpp                          | 9 ++++-----
 src/plugins/ctf/fs-src/fs.hpp                            | 4 ++--
 tests/lib/conds/clk-cls-compat-postconds-triggers.cpp    | 4 ++--
 .../plugins/flt.utils.muxer/test-clock-compatibility.cpp | 4 ++--
 tools/format-cpp.sh                                      | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/cpp-common/bt2c/logging.hpp b/src/cpp-common/bt2c/logging.hpp
index 2aa22040..f8140dde 100644
--- a/src/cpp-common/bt2c/logging.hpp
+++ b/src/cpp-common/bt2c/logging.hpp
@@ -79,9 +79,8 @@ public:
      * `tag`.
      */
     explicit Logger(const bt2::SelfComponent selfComp, std::string tag) noexcept :
-        _mSelfComp {selfComp}, _mLevel {static_cast<Level>(selfComp.loggingLevel())}, _mTag {
-                                                                                          std::move(
-                                                                                              tag)}
+        _mSelfComp {selfComp}, _mLevel {static_cast<Level>(selfComp.loggingLevel())},
+        _mTag {std::move(tag)}
     {
     }
 
@@ -142,8 +141,8 @@ public:
      */
     explicit Logger(const Logger& other, std::string newTag) :
         _mSelfCompCls {other._mSelfCompCls}, _mSelfComp {other._mSelfComp},
-        _mSelfMsgIter {other._mSelfMsgIter},
-        _mModuleName {other._mModuleName}, _mLevel {other._mLevel}, _mTag {std::move(newTag)}
+        _mSelfMsgIter {other._mSelfMsgIter}, _mModuleName {other._mModuleName},
+        _mLevel {other._mLevel}, _mTag {std::move(newTag)}
     {
     }
 
diff --git a/src/plugins/ctf/fs-src/fs.hpp b/src/plugins/ctf/fs-src/fs.hpp
index 4fe799f1..4f7837d6 100644
--- a/src/plugins/ctf/fs-src/fs.hpp
+++ b/src/plugins/ctf/fs-src/fs.hpp
@@ -95,8 +95,8 @@ struct ctf_fs_msg_iter_data
     using UP = std::unique_ptr<ctf_fs_msg_iter_data>;
 
     explicit ctf_fs_msg_iter_data(bt_self_message_iterator *selfMsgIter) :
-        self_msg_iter {selfMsgIter}, logger {bt2::SelfMessageIterator {self_msg_iter},
-                                             "PLUGIN/SRC.CTF.FS/MSG-ITER"}
+        self_msg_iter {selfMsgIter},
+        logger {bt2::SelfMessageIterator {self_msg_iter}, "PLUGIN/SRC.CTF.FS/MSG-ITER"}
     {
     }
 
diff --git a/tests/lib/conds/clk-cls-compat-postconds-triggers.cpp b/tests/lib/conds/clk-cls-compat-postconds-triggers.cpp
index aa7e6876..5f5cbed0 100644
--- a/tests/lib/conds/clk-cls-compat-postconds-triggers.cpp
+++ b/tests/lib/conds/clk-cls-compat-postconds-triggers.cpp
@@ -31,8 +31,8 @@ public:
                                  const MsgType msgType2,
                                  const CreateClockCls createClockCls2) noexcept :
         _mMsgType1 {msgType1},
-        _mMsgType2 {msgType2}, _mCreateClockCls1 {createClockCls1}, _mCreateClockCls2 {
-                                                                        createClockCls2}
+        _mMsgType2 {msgType2}, _mCreateClockCls1 {createClockCls1},
+        _mCreateClockCls2 {createClockCls2}
     {
     }
 
diff --git a/tests/plugins/flt.utils.muxer/test-clock-compatibility.cpp b/tests/plugins/flt.utils.muxer/test-clock-compatibility.cpp
index ef05d1d5..60bbd763 100644
--- a/tests/plugins/flt.utils.muxer/test-clock-compatibility.cpp
+++ b/tests/plugins/flt.utils.muxer/test-clock-compatibility.cpp
@@ -156,8 +156,8 @@ public:
     ErrorTestCase(CreateClockClass createClockClass1Param, CreateClockClass createClockClass2Param,
                   const char * const testName, const char * const expectedCauseMsg) :
         _mCreateClockClass1 {createClockClass1Param},
-        _mCreateClockClass2 {createClockClass2Param}, _mTestName {testName}, _mExpectedCauseMsg {
-                                                                                 expectedCauseMsg}
+        _mCreateClockClass2 {createClockClass2Param}, _mTestName {testName},
+        _mExpectedCauseMsg {expectedCauseMsg}
     {
     }
 
diff --git a/tools/format-cpp.sh b/tools/format-cpp.sh
index c0a9583a..763c726b 100755
--- a/tools/format-cpp.sh
+++ b/tools/format-cpp.sh
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2020-2023 Philippe Proulx <pproulx@efficios.com>
 
-expected_formatter_major_version=15
+expected_formatter_major_version=16
 
 # Runs the formatter, returning 1 if it's not the expected version.
 #
-- 
2.34.1