diff options
author | Ed Tanous <edtanous@google.com> | 2023-05-25 20:03:14 +0300 |
---|---|---|
committer | Ed Tanous <edtanous@google.com> | 2023-05-25 20:06:29 +0300 |
commit | faf100f963c9cd8c81c277ad6bc188eecd0fc12b (patch) | |
tree | 0ea8561f7561eb5f196f290394430e3b316c0155 | |
parent | cf0e004c3c13f4955f98b315fc58cf81c3f4a32b (diff) | |
download | bmcweb-faf100f963c9cd8c81c277ad6bc188eecd0fc12b.tar.xz |
Fix some includes
System includes should be included with <>, in-tree includes should be
included with "". This was found manually, with the help of the
following grep statement[1].
git grep -o -h "#include .*" | sort | uniq
Tested:
Code compiles
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: I1a6b2a5ba35ccbbb61c67b7c4b036a2d7b3a36a3
-rw-r--r-- | http/http_response.hpp | 2 | ||||
-rw-r--r-- | include/dbus_monitor.hpp | 2 | ||||
-rw-r--r-- | include/kvm_websocket.hpp | 2 | ||||
-rw-r--r-- | include/nbd_proxy.hpp | 2 | ||||
-rw-r--r-- | include/obmc_console.hpp | 2 | ||||
-rw-r--r-- | include/vm_websocket.hpp | 2 | ||||
-rw-r--r-- | redfish-core/include/utils/json_utils.hpp | 3 | ||||
-rw-r--r-- | redfish-core/src/error_messages.cpp | 2 | ||||
-rw-r--r-- | src/webserver_main.cpp | 2 | ||||
-rw-r--r-- | test/include/google/google_service_root_test.cpp | 3 | ||||
-rw-r--r-- | test/redfish-core/lib/service_root_test.cpp | 3 |
11 files changed, 14 insertions, 11 deletions
diff --git a/http/http_response.hpp b/http/http_response.hpp index bece17a3e3..1a4ef16d4e 100644 --- a/http/http_response.hpp +++ b/http/http_response.hpp @@ -1,10 +1,10 @@ #pragma once #include "logging.hpp" -#include "nlohmann/json.hpp" #include "utils/hex_utils.hpp" #include <boost/beast/http/message.hpp> #include <boost/beast/http/string_body.hpp> +#include <nlohmann/json.hpp> #include <optional> #include <string> diff --git a/include/dbus_monitor.hpp b/include/dbus_monitor.hpp index 094f183e98..46ef25e00e 100644 --- a/include/dbus_monitor.hpp +++ b/include/dbus_monitor.hpp @@ -3,12 +3,12 @@ #include "async_resp.hpp" #include "dbus_singleton.hpp" #include "openbmc_dbus_rest.hpp" +#include "websocket.hpp" #include <boost/container/flat_map.hpp> #include <boost/container/flat_set.hpp> #include <sdbusplus/bus/match.hpp> #include <sdbusplus/message/types.hpp> -#include <websocket.hpp> #include <variant> diff --git a/include/kvm_websocket.hpp b/include/kvm_websocket.hpp index 942e9c607e..8ea3434832 100644 --- a/include/kvm_websocket.hpp +++ b/include/kvm_websocket.hpp @@ -1,11 +1,11 @@ #pragma once #include "app.hpp" #include "async_resp.hpp" +#include "websocket.hpp" #include <sys/socket.h> #include <boost/container/flat_map.hpp> -#include <websocket.hpp> namespace crow { diff --git a/include/nbd_proxy.hpp b/include/nbd_proxy.hpp index e3d4c4b2b2..e4d709b65e 100644 --- a/include/nbd_proxy.hpp +++ b/include/nbd_proxy.hpp @@ -17,12 +17,12 @@ #include "app.hpp" #include "dbus_utility.hpp" #include "privileges.hpp" +#include "websocket.hpp" #include <boost/asio/local/stream_protocol.hpp> #include <boost/asio/write.hpp> #include <boost/beast/core/buffers_to_string.hpp> #include <boost/container/flat_map.hpp> -#include <websocket.hpp> #include <string_view> diff --git a/include/obmc_console.hpp b/include/obmc_console.hpp index ae8143a9df..5457b7d5b4 100644 --- a/include/obmc_console.hpp +++ b/include/obmc_console.hpp @@ -1,12 +1,12 @@ #pragma once #include "app.hpp" #include "async_resp.hpp" +#include "websocket.hpp" #include <sys/socket.h> #include <boost/asio/local/stream_protocol.hpp> #include <boost/container/flat_set.hpp> -#include <websocket.hpp> namespace crow { diff --git a/include/vm_websocket.hpp b/include/vm_websocket.hpp index fed36815d8..1e1b7e13d1 100644 --- a/include/vm_websocket.hpp +++ b/include/vm_websocket.hpp @@ -1,12 +1,12 @@ #pragma once #include "app.hpp" +#include "websocket.hpp" #include <boost/beast/core/flat_static_buffer.hpp> #include <boost/process/async_pipe.hpp> #include <boost/process/child.hpp> #include <boost/process/io.hpp> -#include <websocket.hpp> #include <csignal> diff --git a/redfish-core/include/utils/json_utils.hpp b/redfish-core/include/utils/json_utils.hpp index fa49d3fc04..b98cf0e2b9 100644 --- a/redfish-core/include/utils/json_utils.hpp +++ b/redfish-core/include/utils/json_utils.hpp @@ -19,7 +19,8 @@ #include "http_request.hpp" #include "http_response.hpp" #include "logging.hpp" -#include "nlohmann/json.hpp" + +#include <nlohmann/json.hpp> #include <array> #include <cmath> diff --git a/redfish-core/src/error_messages.cpp b/redfish-core/src/error_messages.cpp index 5f802462ef..e3fb74bdba 100644 --- a/redfish-core/src/error_messages.cpp +++ b/redfish-core/src/error_messages.cpp @@ -17,13 +17,13 @@ #include "http_response.hpp" #include "logging.hpp" -#include "nlohmann/json.hpp" #include "registries.hpp" #include "registries/base_message_registry.hpp" #include "source_location.hpp" #include <boost/beast/http/field.hpp> #include <boost/beast/http/status.hpp> +#include <nlohmann/json.hpp> #include <array> #include <cstddef> diff --git a/src/webserver_main.cpp b/src/webserver_main.cpp index a7f06b8e76..d3021a83d0 100644 --- a/src/webserver_main.cpp +++ b/src/webserver_main.cpp @@ -4,6 +4,7 @@ #include "cors_preflight.hpp" #include "dbus_monitor.hpp" #include "dbus_singleton.hpp" +#include "google/google_service_root.hpp" #include "hostname_monitor.hpp" #include "ibm/management_console_rest.hpp" #include "image_upload.hpp" @@ -23,7 +24,6 @@ #include <systemd/sd-daemon.h> #include <boost/asio/io_context.hpp> -#include <google/google_service_root.hpp> #include <sdbusplus/asio/connection.hpp> #include <sdbusplus/bus.hpp> #include <sdbusplus/server.hpp> diff --git a/test/include/google/google_service_root_test.cpp b/test/include/google/google_service_root_test.cpp index b4a476b2dd..88b40d71db 100644 --- a/test/include/google/google_service_root_test.cpp +++ b/test/include/google/google_service_root_test.cpp @@ -1,7 +1,8 @@ #include "async_resp.hpp" #include "google/google_service_root.hpp" #include "http_request.hpp" -#include "nlohmann/json.hpp" + +#include <nlohmann/json.hpp> #include <gtest/gtest.h> diff --git a/test/redfish-core/lib/service_root_test.cpp b/test/redfish-core/lib/service_root_test.cpp index e11f113f0e..78c068d760 100644 --- a/test/redfish-core/lib/service_root_test.cpp +++ b/test/redfish-core/lib/service_root_test.cpp @@ -2,9 +2,10 @@ #include "async_resp.hpp" #include "http_response.hpp" -#include "nlohmann/json.hpp" #include "service_root.hpp" +#include <nlohmann/json.hpp> + #include <memory> #include <vector> |