clang-format: update to latest from docs repo
Since `Cpp11` is an alias for `Latest` and we should tend towards using the
latest C++ standard, update the C++ standard to Latest.
https://github.com/llvm/llvm-project/commit/e5032567903de19962333c4bf7d2edceaf4f9824#diff-b49a097415dff2837d9626d422c58ba8R82
https://github.com/openbmc/docs/blob/master/style/cpp/.clang-format
Also, other OpenBMC repos are doing the same.
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I449e88bb4e1e262060110e1a8f3e8db3ddfc74cf
diff --git a/oem/ibm/libpldmresponder/file_io.cpp b/oem/ibm/libpldmresponder/file_io.cpp
index 12e9fed..b05a525 100644
--- a/oem/ibm/libpldmresponder/file_io.cpp
+++ b/oem/ibm/libpldmresponder/file_io.cpp
@@ -2,6 +2,8 @@
#include "file_io.hpp"
+#include "libpldm/base.h"
+
#include "file_io_by_type.hpp"
#include "file_table.hpp"
#include "utils.hpp"
@@ -18,8 +20,6 @@
#include <iostream>
#include <memory>
-#include "libpldm/base.h"
-
namespace pldm
{
diff --git a/oem/ibm/libpldmresponder/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index 9ff8f86..60fa9a1 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -2,6 +2,10 @@
#include "config.h"
+#include "libpldm/base.h"
+#include "oem/ibm/libpldm/file_io.h"
+#include "oem/ibm/libpldm/host.h"
+
#include "handler.hpp"
#include "utils.hpp"
@@ -15,10 +19,6 @@
#include <iostream>
#include <vector>
-#include "libpldm/base.h"
-#include "oem/ibm/libpldm/file_io.h"
-#include "oem/ibm/libpldm/host.h"
-
namespace pldm
{
namespace responder
diff --git a/oem/ibm/libpldmresponder/file_io_by_type.cpp b/oem/ibm/libpldmresponder/file_io_by_type.cpp
index 540937c..36f5f6c 100644
--- a/oem/ibm/libpldmresponder/file_io_by_type.cpp
+++ b/oem/ibm/libpldmresponder/file_io_by_type.cpp
@@ -2,6 +2,9 @@
#include "file_io_by_type.hpp"
+#include "libpldm/base.h"
+#include "oem/ibm/libpldm/file_io.h"
+
#include "file_io_type_cert.hpp"
#include "file_io_type_dump.hpp"
#include "file_io_type_lid.hpp"
@@ -12,15 +15,13 @@
#include <stdint.h>
#include <unistd.h>
+#include <xyz/openbmc_project/Logging/Entry/server.hpp>
+
#include <exception>
#include <filesystem>
#include <fstream>
#include <iostream>
#include <vector>
-#include <xyz/openbmc_project/Logging/Entry/server.hpp>
-
-#include "libpldm/base.h"
-#include "oem/ibm/libpldm/file_io.h"
namespace pldm
{
diff --git a/oem/ibm/libpldmresponder/file_io_by_type.hpp b/oem/ibm/libpldmresponder/file_io_by_type.hpp
index 0a5c1d8..73f27d8 100644
--- a/oem/ibm/libpldmresponder/file_io_by_type.hpp
+++ b/oem/ibm/libpldmresponder/file_io_by_type.hpp
@@ -101,14 +101,12 @@
/** @brief Constructor to create a FileHandler object
*/
FileHandler(uint32_t fileHandle) : fileHandle(fileHandle)
- {
- }
+ {}
/** FileHandler destructor
*/
virtual ~FileHandler()
- {
- }
+ {}
protected:
uint32_t fileHandle; //!< file handle indicating name of file or invalid
diff --git a/oem/ibm/libpldmresponder/file_io_type_cert.cpp b/oem/ibm/libpldmresponder/file_io_type_cert.cpp
index aef3f4c..82aecbf 100644
--- a/oem/ibm/libpldmresponder/file_io_type_cert.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_cert.cpp
@@ -1,14 +1,14 @@
#include "file_io_type_cert.hpp"
+#include "libpldm/base.h"
+#include "oem/ibm/libpldm/file_io.h"
+
#include "utils.hpp"
#include <stdint.h>
#include <iostream>
-#include "libpldm/base.h"
-#include "oem/ibm/libpldm/file_io.h"
-
namespace pldm
{
namespace responder
diff --git a/oem/ibm/libpldmresponder/file_io_type_cert.hpp b/oem/ibm/libpldmresponder/file_io_type_cert.hpp
index a981fab..a1c8d9f 100644
--- a/oem/ibm/libpldmresponder/file_io_type_cert.hpp
+++ b/oem/ibm/libpldmresponder/file_io_type_cert.hpp
@@ -27,8 +27,7 @@
*/
CertHandler(uint32_t fileHandle, uint16_t fileType) :
FileHandler(fileHandle), certType(fileType)
- {
- }
+ {}
virtual int writeFromMemory(uint32_t offset, uint32_t length,
uint64_t address);
@@ -48,8 +47,7 @@
/** @brief CertHandler destructor
*/
~CertHandler()
- {
- }
+ {}
private:
uint16_t certType; //!< type of the certificate
diff --git a/oem/ibm/libpldmresponder/file_io_type_dump.cpp b/oem/ibm/libpldmresponder/file_io_type_dump.cpp
index 8572259..188fc4a 100644
--- a/oem/ibm/libpldmresponder/file_io_type_dump.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_dump.cpp
@@ -1,5 +1,8 @@
#include "file_io_type_dump.hpp"
+#include "libpldm/base.h"
+#include "oem/ibm/libpldm/file_io.h"
+
#include "utils.hpp"
#include "xyz/openbmc_project/Common/error.hpp"
@@ -7,14 +10,12 @@
#include <systemd/sd-bus.h>
#include <unistd.h>
-#include <exception>
-#include <filesystem>
-#include <iostream>
#include <sdbusplus/server.hpp>
#include <xyz/openbmc_project/Dump/NewDump/server.hpp>
-#include "libpldm/base.h"
-#include "oem/ibm/libpldm/file_io.h"
+#include <exception>
+#include <filesystem>
+#include <iostream>
using namespace pldm::utils;
diff --git a/oem/ibm/libpldmresponder/file_io_type_dump.hpp b/oem/ibm/libpldmresponder/file_io_type_dump.hpp
index 79360d0..34b880f 100644
--- a/oem/ibm/libpldmresponder/file_io_type_dump.hpp
+++ b/oem/ibm/libpldmresponder/file_io_type_dump.hpp
@@ -18,8 +18,7 @@
/** @brief DumpHandler constructor
*/
DumpHandler(uint32_t fileHandle) : FileHandler(fileHandle)
- {
- }
+ {}
virtual int writeFromMemory(uint32_t offset, uint32_t length,
uint64_t address);
@@ -44,8 +43,7 @@
/** @brief DumpHandler destructor
*/
~DumpHandler()
- {
- }
+ {}
private:
static int fd; //!< fd to manage the dump offload to bmc
diff --git a/oem/ibm/libpldmresponder/file_io_type_lid.hpp b/oem/ibm/libpldmresponder/file_io_type_lid.hpp
index 163629d..0f640f0 100644
--- a/oem/ibm/libpldmresponder/file_io_type_lid.hpp
+++ b/oem/ibm/libpldmresponder/file_io_type_lid.hpp
@@ -69,8 +69,7 @@
/** @brief LidHandler destructor
*/
~LidHandler()
- {
- }
+ {}
protected:
std::string lidPath;
diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.cpp b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
index 69d3f2e..ef21c01 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.cpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.cpp
@@ -2,6 +2,9 @@
#include "file_io_type_pel.hpp"
+#include "libpldm/base.h"
+#include "oem/ibm/libpldm/file_io.h"
+
#include "utils.hpp"
#include "xyz/openbmc_project/Common/error.hpp"
@@ -9,16 +12,14 @@
#include <systemd/sd-bus.h>
#include <unistd.h>
+#include <sdbusplus/server.hpp>
+#include <xyz/openbmc_project/Logging/Entry/server.hpp>
+
#include <exception>
#include <filesystem>
#include <fstream>
#include <iostream>
-#include <sdbusplus/server.hpp>
#include <vector>
-#include <xyz/openbmc_project/Logging/Entry/server.hpp>
-
-#include "libpldm/base.h"
-#include "oem/ibm/libpldm/file_io.h"
namespace pldm
{
diff --git a/oem/ibm/libpldmresponder/file_io_type_pel.hpp b/oem/ibm/libpldmresponder/file_io_type_pel.hpp
index 3d5019a..90d012f 100644
--- a/oem/ibm/libpldmresponder/file_io_type_pel.hpp
+++ b/oem/ibm/libpldmresponder/file_io_type_pel.hpp
@@ -20,8 +20,7 @@
/** @brief PelHandler constructor
*/
PelHandler(uint32_t fileHandle) : FileHandler(fileHandle)
- {
- }
+ {}
virtual int writeFromMemory(uint32_t offset, uint32_t length,
uint64_t address);
@@ -52,8 +51,7 @@
/** @brief PelHandler destructor
*/
~PelHandler()
- {
- }
+ {}
};
} // namespace responder
diff --git a/oem/ibm/libpldmresponder/file_table.cpp b/oem/ibm/libpldmresponder/file_table.cpp
index 45a49fe..9a71b30 100644
--- a/oem/ibm/libpldmresponder/file_table.cpp
+++ b/oem/ibm/libpldmresponder/file_table.cpp
@@ -1,10 +1,10 @@
#include "file_table.hpp"
+#include "libpldm/utils.h"
+
#include <fstream>
#include <iostream>
-#include "libpldm/utils.h"
-
namespace pldm
{
diff --git a/oem/ibm/libpldmresponder/file_table.hpp b/oem/ibm/libpldmresponder/file_table.hpp
index 4b82f29..3354e89 100644
--- a/oem/ibm/libpldmresponder/file_table.hpp
+++ b/oem/ibm/libpldmresponder/file_table.hpp
@@ -1,12 +1,13 @@
#pragma once
+#include "libpldm/pldm_types.h"
+
#include <stdint.h>
-#include <filesystem>
#include <nlohmann/json.hpp>
-#include <vector>
-#include "libpldm/pldm_types.h"
+#include <filesystem>
+#include <vector>
namespace pldm
{
diff --git a/oem/ibm/test/libpldm_fileio_test.cpp b/oem/ibm/test/libpldm_fileio_test.cpp
index 275f295..10ba83f 100644
--- a/oem/ibm/test/libpldm_fileio_test.cpp
+++ b/oem/ibm/test/libpldm_fileio_test.cpp
@@ -1,10 +1,10 @@
+#include "libpldm/base.h"
+#include "libpldm/file_io.h"
+
#include <string.h>
#include <array>
-#include "libpldm/base.h"
-#include "libpldm/file_io.h"
-
#include <gtest/gtest.h>
constexpr auto hdrSize = sizeof(pldm_msg_hdr);
diff --git a/oem/ibm/test/libpldm_host_test.cpp b/oem/ibm/test/libpldm_host_test.cpp
index 26ae5aa..73e35d1 100644
--- a/oem/ibm/test/libpldm_host_test.cpp
+++ b/oem/ibm/test/libpldm_host_test.cpp
@@ -1,9 +1,9 @@
+#include "oem/ibm/libpldm/host.h"
+
#include <string.h>
#include <array>
-#include "oem/ibm/libpldm/host.h"
-
#include <gtest/gtest.h>
constexpr auto hdrSize = sizeof(pldm_msg_hdr);
diff --git a/oem/ibm/test/libpldmresponder_fileio_test.cpp b/oem/ibm/test/libpldmresponder_fileio_test.cpp
index d50e5fc..e425a9a 100644
--- a/oem/ibm/test/libpldmresponder_fileio_test.cpp
+++ b/oem/ibm/test/libpldmresponder_fileio_test.cpp
@@ -1,3 +1,6 @@
+#include "libpldm/base.h"
+#include "libpldm/file_io.h"
+
#include "libpldmresponder/file_io.hpp"
#include "libpldmresponder/file_io_by_type.hpp"
#include "libpldmresponder/file_io_type_cert.hpp"
@@ -7,13 +10,11 @@
#include "libpldmresponder/file_table.hpp"
#include "xyz/openbmc_project/Common/error.hpp"
-#include <filesystem>
-#include <fstream>
#include <nlohmann/json.hpp>
#include <phosphor-logging/elog-errors.hpp>
-#include "libpldm/base.h"
-#include "libpldm/file_io.h"
+#include <filesystem>
+#include <fstream>
#include <gmock/gmock-matchers.h>
#include <gmock/gmock.h>