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>

elog_entry.hpp

diff --git a/elog_entry.hpp b/elog_entry.hpp
index 87cc7ea..d8b9025 100644
--- a/elog_entry.hpp
+++ b/elog_entry.hpp
@@ -17,11 +17,11 @@
 {
 
 using EntryIfaces = sdbusplus::server::object_t<
-    sdbusplus::xyz::openbmc_project::Logging::server::Entry,
-    sdbusplus::xyz::openbmc_project::Object::server::Delete,
-    sdbusplus::xyz::openbmc_project::Association::server::Definitions,
-    sdbusplus::xyz::openbmc_project::Software::server::Version,
-    sdbusplus::xyz::openbmc_project::Common::server::FilePath>;
+    sdbusplus::server::xyz::openbmc_project::logging::Entry,
+    sdbusplus::server::xyz::openbmc_project::object::Delete,
+    sdbusplus::server::xyz::openbmc_project::association::Definitions,
+    sdbusplus::server::xyz::openbmc_project::software::Version,
+    sdbusplus::server::xyz::openbmc_project::common::FilePath>;
 
 using AssociationList =
     std::vector<std::tuple<std::string, std::string, std::string>>;
@@ -79,7 +79,7 @@
         associations(std::move(objects), true);
         // Store a copy of associations in case we need to recreate
         assocs = associations();
-        sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved(false,
+        sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved(false,
                                                                           true);
 
         version(fwVersion, true);
@@ -113,7 +113,7 @@
      */
     bool resolved(bool value) override;
 
-    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolved;
+    using sdbusplus::server::xyz::openbmc_project::logging::Entry::resolved;
 
     /** @brief Update eventId string of the error.
      *  @param[in] value - The eventID
@@ -121,7 +121,7 @@
      */
     std::string eventId(std::string value) override;
 
-    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::eventId;
+    using sdbusplus::server::xyz::openbmc_project::logging::Entry::eventId;
 
     /** @brief Update resolution string of the error.
      *  @param[in] value - The resolution
@@ -129,7 +129,7 @@
      */
     std::string resolution(std::string value) override;
 
-    using sdbusplus::xyz::openbmc_project::Logging::server::Entry::resolution;
+    using sdbusplus::server::xyz::openbmc_project::logging::Entry::resolution;
 
     /** @brief Delete this d-bus object.
      */