commit 6ddbf69e835749143440584d54e3ccb4e39ee3df
author Willy Tu <wltu@google.com> Tue Sep 05 10:54:16 2023 -0700
committer Matt Spinler <spinler@us.ibm.com> Fri Oct 27 16:06:19 2023 +0000
tree b1fe2dd49f4574c47e8958e842a09f5186ac2689
parent 5fb575ae382384e073bfc26366ac06de5c19c023

Remove SDBUSPP_REMOVE_DEPRECATED_NAMESPACE

Fix the code to support new sdbusplus error without
SDBUSPP_REMOVE_DEPRECATED_NAMESPACE.

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

log_manager.hpp

diff --git a/log_manager.hpp b/log_manager.hpp
index 275530e..8f5ca43 100644
--- a/log_manager.hpp
+++ b/log_manager.hpp
@@ -20,9 +20,9 @@
 extern const std::map<std::string, std::vector<std::string>> g_errMetaMap;
 extern const std::map<std::string, level> g_errLevelMap;
 
-using CreateIface = sdbusplus::xyz::openbmc_project::Logging::server::Create;
+using CreateIface = sdbusplus::server::xyz::openbmc_project::logging::Create;
 using DeleteAllIface =
-    sdbusplus::xyz::openbmc_project::Collection::server::DeleteAll;
+    sdbusplus::server::xyz::openbmc_project::collection::DeleteAll;
 
 namespace details
 {
@@ -30,7 +30,7 @@
 using ServerObject = typename sdbusplus::server::object_t<T...>;
 
 using ManagerIface =
-    sdbusplus::xyz::openbmc_project::Logging::Internal::server::Manager;
+    sdbusplus::server::xyz::openbmc_project::logging::internal::Manager;
 
 } // namespace details
 
@@ -184,7 +184,7 @@
      */
     void create(
         const std::string& message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         const std::map<std::string, std::string>& additionalData);
 
     /** @brief Creates an event log, and accepts FFDC files
@@ -203,7 +203,7 @@
      */
     void createWithFFDC(
         const std::string& message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         const std::map<std::string, std::string>& additionalData,
         const FFDCEntries& ffdc);
 
@@ -381,7 +381,7 @@
      */
     void create(
         std::string message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         std::map<std::string, std::string> additionalData) override
     {
         manager.create(message, severity, additionalData);
@@ -399,7 +399,7 @@
      */
     void createWithFFDCFiles(
         std::string message,
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::Level severity,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::Level severity,
         std::map<std::string, std::string> additionalData,
         std::vector<std::tuple<CreateIface::FFDCFormat, uint8_t, uint8_t,
                                sdbusplus::message::unix_fd>>