Remove double inheritance on faultlog entry
This log entry appears to have inherited from
sdbusplus::server::object_t twice, once directly, and once through its
inheritance of phosphor::dump::entry. This is causing a warning on
destructor ordering.
Looking at the code, there is a defer signal, but it's not clear if
that's what the code was trying to accomplish. Regardless, this gets
the code to compile again.
I'm open to input if there's a better way to fix this.
Change-Id: I9c7b3f18d049b7291ee799935002aa9fb129cbf9
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/faultlog_dump_entry.hpp b/faultlog_dump_entry.hpp
index efb6150..60f5bd1 100644
--- a/faultlog_dump_entry.hpp
+++ b/faultlog_dump_entry.hpp
@@ -18,14 +18,12 @@
template <typename T>
using ServerObject = typename sdbusplus::server::object_t<T>;
-using EntryIfaces = sdbusplus::server::object_t<>;
-
class Manager;
/** @class Entry
* @brief OpenBMC Fault Log Dump Entry implementation.
*/
-class Entry : virtual public EntryIfaces, virtual public phosphor::dump::Entry
+class Entry : virtual public phosphor::dump::Entry
{
public:
Entry() = delete;
@@ -53,14 +51,10 @@
const std::filesystem::path& file,
phosphor::dump::OperationStatus status, std::string originatorId,
originatorTypes originatorType, phosphor::dump::Manager& parent) :
- EntryIfaces(bus, objPath.c_str(), EntryIfaces::action::defer_emit),
phosphor::dump::Entry(bus, objPath.c_str(), dumpId, timeStamp, fileSize,
status, originatorId, originatorType, parent),
file(file)
- {
- // Emit deferred signal.
- this->phosphor::dump::faultlog::EntryIfaces::emit_object_added();
- }
+ {}
/** @brief Delete this d-bus object.
*/