commit 523e2d1b2010ee3017bcf435ea02a9f5f2948cb0
author Willy Tu <wltu@google.com> Tue Sep 05 11:36:48 2023 -0700
committer Vernon Mauery <vernon.mauery@linux.intel.com> Mon Oct 02 20:37:52 2023 +0000
tree d86da94363c2738263698be846386b9e11d6f2ca
parent 5203602888ecd350bafc941b932ad3e01350be19

ipmid: Update sdbuspp namespaces

Fixed all errors when we remove
`SDBUSPP_REMOVE_DEPRECATED_NAMESPACE` in sdbusplus.

Change-Id: I5607585b2709faa7aee347d26e458ef769ca1626
Signed-off-by: Willy Tu <wltu@google.com>

app/channel.cpp

diff --git a/app/channel.cpp b/app/channel.cpp
index 5da9739..c22bd8d 100644
--- a/app/channel.cpp
+++ b/app/channel.cpp
@@ -16,7 +16,7 @@
 #include <string>
 
 using namespace phosphor::logging;
-using namespace sdbusplus::xyz::openbmc_project::Common::Error;
+using namespace sdbusplus::error::xyz::openbmc_project::common;
 
 namespace cipher
 {

app/watchdog.cpp

diff --git a/app/watchdog.cpp b/app/watchdog.cpp
index 2f6d883..22ad30d 100644
--- a/app/watchdog.cpp
+++ b/app/watchdog.cpp
@@ -17,7 +17,7 @@
 using phosphor::logging::commit;
 using phosphor::logging::level;
 using phosphor::logging::log;
-using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
+using sdbusplus::error::xyz::openbmc_project::common::InternalFailure;
 
 static bool lastCallSuccessful = false;
 

app/watchdog_service.cpp

diff --git a/app/watchdog_service.cpp b/app/watchdog_service.cpp
index f9fb625..744ee79 100644
--- a/app/watchdog_service.cpp
+++ b/app/watchdog_service.cpp
@@ -17,9 +17,9 @@
 using phosphor::logging::entry;
 using phosphor::logging::level;
 using phosphor::logging::log;
-using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
-using sdbusplus::xyz::openbmc_project::State::server::convertForMessage;
-using sdbusplus::xyz::openbmc_project::State::server::Watchdog;
+using sdbusplus::common::xyz::openbmc_project::state::convertForMessage;
+using sdbusplus::error::xyz::openbmc_project::common::InternalFailure;
+using sdbusplus::server::xyz::openbmc_project::state::Watchdog;
 
 static constexpr char wd_path[] = "/xyz/openbmc_project/watchdog/host0";
 static constexpr char wd_intf[] = "xyz.openbmc_project.State.Watchdog";

app/watchdog_service.hpp

diff --git a/app/watchdog_service.hpp b/app/watchdog_service.hpp
index f466ec7..b1f490a 100644
--- a/app/watchdog_service.hpp
+++ b/app/watchdog_service.hpp
@@ -14,9 +14,9 @@
     WatchdogService();
 
     using Action =
-        sdbusplus::xyz::openbmc_project::State::server::Watchdog::Action;
+        sdbusplus::server::xyz::openbmc_project::state::Watchdog::Action;
     using TimerUse =
-        sdbusplus::xyz::openbmc_project::State::server::Watchdog::TimerUse;
+        sdbusplus::server::xyz::openbmc_project::state::Watchdog::TimerUse;
 
     /** @brief Resets the time remaining on the watchdog.
      *         Equivalent to setTimeRemaining(getInterval()).