diff options
| -rw-r--r-- | elog-errors.hpp | 10 | ||||
| -rw-r--r-- | error-HostEvent.hpp | 7 | ||||
| -rw-r--r-- | storageaddsel.cpp | 4 |
3 files changed, 6 insertions, 15 deletions
diff --git a/elog-errors.hpp b/elog-errors.hpp index 73e2dc1..02649f4 100644 --- a/elog-errors.hpp +++ b/elog-errors.hpp @@ -37,13 +37,10 @@ namespace open_power { namespace Host { -namespace Event -{ namespace Error { struct Event; } // namespace Error -} // namespace Event } // namespace Host } // namespace open_power } // namespace org @@ -1199,8 +1196,6 @@ namespace open_power { namespace Host { -namespace Event -{ namespace _Event { @@ -1224,7 +1219,6 @@ struct Event }; -} // namespace Event } // namespace Host } // namespace open_power } // namespace org @@ -1234,9 +1228,9 @@ namespace details { template <> -struct map_exception_type<sdbusplus::org::open_power::Host::Event::Error::Event> +struct map_exception_type<sdbusplus::org::open_power::Host::Error::Event> { - using type = org::open_power::Host::Event::Event; + using type = org::open_power::Host::Event; }; } diff --git a/error-HostEvent.hpp b/error-HostEvent.hpp index f8abf21..186e28e 100644 --- a/error-HostEvent.hpp +++ b/error-HostEvent.hpp @@ -10,18 +10,16 @@ namespace open_power { namespace Host { -namespace Event -{ namespace Error { struct Event final : public sdbusplus::exception_t { - static constexpr auto errName = "org.open_power.Host.Event.Error.Event"; + static constexpr auto errName = "org.open_power.Host.Error.Event"; static constexpr auto errDesc = "A host system event was received"; static constexpr auto errWhat = - "org.open_power.Host.Event.Error.Event: A host system event was received"; + "org.open_power.Host.Error.Event: A host system event was received"; const char* name() const noexcept override; const char* description() const noexcept override; @@ -29,7 +27,6 @@ struct Event final : public sdbusplus::exception_t }; } // namespace Error -} // namespace Event } // namespace Host } // namespace open_power } // namespace org diff --git a/storageaddsel.cpp b/storageaddsel.cpp index 3232406..01147ac 100644 --- a/storageaddsel.cpp +++ b/storageaddsel.cpp @@ -202,8 +202,8 @@ int send_esel_to_dbus(const char *desc, } selData[debuglen*3] = '\0'; - using error = sdbusplus::org::open_power::Host::Event::Error::Event; - using metadata = org::open_power::Host::Event::Event; + using error = sdbusplus::org::open_power::Host::Error::Event; + using metadata = org::open_power::Host::Event; report<error>(metadata::ESEL(selData.get()), metadata::CALLOUT_INVENTORY_PATH(inventoryPath.c_str())); |
