diff options
| author | Ed Tanous <edtanous@google.com> | 2023-01-14 04:40:03 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2023-02-13 20:28:21 +0300 |
| commit | a8e884fc4e2fae0c79454ee865c9b9e0534f6763 (patch) | |
| tree | cdf9d867f9c4e42cc0a2bca9917a8c9788854341 | |
| parent | b1d736fc6ba711ddbb71ebdbde0ebde7c7c9a893 (diff) | |
| download | bmcweb-a8e884fc4e2fae0c79454ee865c9b9e0534f6763.tar.xz | |
Fix a couple #includes
In the continual quest to get tidy passing when run in isolation, fix
some more includes.
This includes removing a circular #include to app.hpp. We don't use
app.hpp in these files, which is why our code compiles but having this
include it here causes a few circular dependencies
app.hpp -> http_server.hpp -> persistent_data.hpp -> app.hpp.
app.hpp -> http_server.hpp -> authentication.hpp -> app.hpp.
This confuses clang when run on header files directly.
Fix a couple more includes at the same time.
Tested: Code compiles
Signed-off-by: Ed Tanous <edtanous@google.com>
Change-Id: Ib62d78b49c7e38ef7061c9fbbf6b3d463f11917d
| -rw-r--r-- | include/authentication.hpp | 1 | ||||
| -rw-r--r-- | include/persistent_data.hpp | 1 | ||||
| -rw-r--r-- | redfish-core/lib/fabric_adapters.hpp | 2 | ||||
| -rw-r--r-- | redfish-core/lib/storage.hpp | 2 | ||||
| -rw-r--r-- | redfish-core/lib/update_service.hpp | 1 | ||||
| -rw-r--r-- | test/redfish-core/include/redfish_aggregator_test.cpp | 1 |
6 files changed, 6 insertions, 2 deletions
diff --git a/include/authentication.hpp b/include/authentication.hpp index 309c898873..7110034cf2 100644 --- a/include/authentication.hpp +++ b/include/authentication.hpp @@ -1,6 +1,5 @@ #pragma once -#include "app.hpp" #include "common.hpp" #include "forward_unauthorized.hpp" #include "http_request.hpp" diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp index 03efb0a198..e93d216827 100644 --- a/include/persistent_data.hpp +++ b/include/persistent_data.hpp @@ -1,6 +1,5 @@ #pragma once -#include "app.hpp" #include "event_service_store.hpp" #include "http_request.hpp" #include "http_response.hpp" diff --git a/redfish-core/lib/fabric_adapters.hpp b/redfish-core/lib/fabric_adapters.hpp index aacb056184..a1e273aae9 100644 --- a/redfish-core/lib/fabric_adapters.hpp +++ b/redfish-core/lib/fabric_adapters.hpp @@ -2,6 +2,8 @@ #include "app.hpp" #include "dbus_utility.hpp" +#include "query.hpp" +#include "registries/privilege_registry.hpp" #include "utils/collection.hpp" #include "utils/json_utils.hpp" diff --git a/redfish-core/lib/storage.hpp b/redfish-core/lib/storage.hpp index 35cd6e14f1..93911e5996 100644 --- a/redfish-core/lib/storage.hpp +++ b/redfish-core/lib/storage.hpp @@ -18,8 +18,10 @@ #include "app.hpp" #include "dbus_utility.hpp" #include "health.hpp" +#include "human_sort.hpp" #include "openbmc_dbus_rest.hpp" #include "query.hpp" +#include "redfish_util.hpp" #include "registries/privilege_registry.hpp" #include "utils/dbus_utils.hpp" diff --git a/redfish-core/lib/update_service.hpp b/redfish-core/lib/update_service.hpp index 3d29f2859b..041e0726cd 100644 --- a/redfish-core/lib/update_service.hpp +++ b/redfish-core/lib/update_service.hpp @@ -21,6 +21,7 @@ #include "dbus_utility.hpp" #include "query.hpp" #include "registries/privilege_registry.hpp" +#include "task.hpp" #include "utils/dbus_utils.hpp" #include "utils/sw_utils.hpp" diff --git a/test/redfish-core/include/redfish_aggregator_test.cpp b/test/redfish-core/include/redfish_aggregator_test.cpp index 345854fdde..4653a81527 100644 --- a/test/redfish-core/include/redfish_aggregator_test.cpp +++ b/test/redfish-core/include/redfish_aggregator_test.cpp @@ -1,3 +1,4 @@ +#include "async_resp.hpp" #include "redfish_aggregator.hpp" #include <nlohmann/json.hpp> |