diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-02-03 20:57:36 -0500 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2017-02-09 20:37:04 -0500 |
| commit | a5cc34c2b7c7be17c6775fc4f8275c203dd41139 (patch) | |
| tree | 79fe3b00797d86e9ca3e884993aab0f81da3d0a8 /manager.hpp | |
| parent | 03f4cd957800210c1763605d755904c95f6079f9 (diff) | |
| download | phosphor-inventory-manager-a5cc34c2b7c7be17c6775fc4f8275c203dd41139.tar.gz phosphor-inventory-manager-a5cc34c2b7c7be17c6775fc4f8275c203dd41139.zip | |
Remove use of sdbusplus::object::object
Cannot use this interface wrapper with property import
constructors at the moment, so just use the interface
classes directly.
Emit interfaces added/removed signals manually.
Change-Id: I688e1b774756d48beac7511dda0387b627e57c1f
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'manager.hpp')
| -rw-r--r-- | manager.hpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/manager.hpp b/manager.hpp index 8b59c1b..c1137a4 100644 --- a/manager.hpp +++ b/manager.hpp @@ -20,7 +20,7 @@ namespace details { template <typename T> -using ServerObject = typename sdbusplus::server::object::object<T>; +using ServerObject = T; using ManagerIface = sdbusplus::xyz::openbmc_project::Inventory::server::Manager; @@ -39,8 +39,7 @@ struct MakeInterface static std::unique_ptr<details::holder::Base> make( sdbusplus::bus::bus& bus, const char* path, - const Interface& props, - bool deferSignals) + const Interface& props) { // TODO: pass props to import constructor... using HolderType = holder::Holder<std::unique_ptr<T>>; @@ -48,8 +47,7 @@ struct MakeInterface std::forward<std::unique_ptr<T>>( std::make_unique<T>( std::forward<decltype(bus)>(bus), - std::forward<decltype(path)>(path), - std::forward<decltype(deferSignals)>(deferSignals)))); + std::forward<decltype(path)>(path)))); } }; } // namespace details |
