diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-02-09 00:02:00 -0500 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-02-09 20:37:04 -0500 |
commit | 12f8a3c8d0725cde677fb183454f2075df54f31e (patch) | |
tree | 21f08f8117128ea862a284b87e9a5bc065dd2814 /manager.hpp | |
parent | 150147aed2951ba0b5c925b2c4f023c5e01f7272 (diff) | |
download | phosphor-inventory-manager-12f8a3c8d0725cde677fb183454f2075df54f31e.tar.gz phosphor-inventory-manager-12f8a3c8d0725cde677fb183454f2075df54f31e.zip |
Remove details namespace
The usage was incoherent and it isn't really necessary for
application only objects.
Change-Id: I76eb5525a39fbbef95548558e777940edf574a06
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'manager.hpp')
-rw-r--r-- | manager.hpp | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/manager.hpp b/manager.hpp index 7127ec5..5e0930b 100644 --- a/manager.hpp +++ b/manager.hpp @@ -16,8 +16,6 @@ namespace inventory { namespace manager { -namespace details -{ template <typename T> using ServerObject = T; @@ -45,7 +43,6 @@ struct MakeInterface return any_ns::any(std::make_shared<T>(bus, path)); } }; -} // namespace details /** @class Manager * @brief OpenBMC inventory manager implementation. @@ -54,7 +51,7 @@ struct MakeInterface * DBus API. */ class Manager final : - public details::ServerObject<details::ManagerIface> + public ServerObject<ManagerIface> { public: Manager() = delete; @@ -75,8 +72,8 @@ class Manager final : Manager(sdbusplus::bus::bus&&, const char*, const char*, const char*); using EventInfo = std::tuple < - std::vector<details::EventBasePtr>, - std::vector<details::Action >>; + std::vector<EventBasePtr>, + std::vector<Action >>; /** @brief Start processing DBus messages. */ void run() noexcept; @@ -90,7 +87,7 @@ class Manager final : /** @brief Event processing entry point. */ void handleEvent(sdbusplus::message::message&, - const details::Event& event, + const Event& event, const EventInfo& info); /** @brief Drop one or more objects from DBus. */ @@ -131,7 +128,7 @@ class Manager final : std::unique_ptr < std::tuple < Manager*, - const details::DbusSignal*, + const DbusSignal*, const EventInfo* >>>; using SigArg = SigArgs::value_type::element_type; @@ -143,7 +140,7 @@ class Manager final : // The int instantiation is safe since the signature of these // functions don't change from one instantiation to the next. using MakerType = std::add_pointer_t < - decltype(details::MakeInterface<int>::make) >; + decltype(MakeInterface<int>::make) >; using Makers = std::map<std::string, std::tuple<MakerType>>; /** @brief Provides weak references to interface holders. |