summaryrefslogtreecommitdiffstats
path: root/manager.hpp
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-01-22 01:03:02 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-02-01 16:13:11 -0500
commit1157af1bd44655b34b10c1308cacaa7c1acb4b38 (patch)
tree47f7bc07f218be5eacb0a107f1d00eab4be18458 /manager.hpp
parent48547a85412bcb5c6430978ce58fb96a96234293 (diff)
downloadphosphor-inventory-manager-1157af1bd44655b34b10c1308cacaa7c1acb4b38.tar.gz
phosphor-inventory-manager-1157af1bd44655b34b10c1308cacaa7c1acb4b38.zip
Remove Object from testcase
Currently the testcase and the application both define their own Object type. Move to a common header. Change-Id: I05dba67dca7855f522be299fcfd361913ed73fbc Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'manager.hpp')
-rw-r--r--manager.hpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/manager.hpp b/manager.hpp
index 616e45d..33980b9 100644
--- a/manager.hpp
+++ b/manager.hpp
@@ -8,6 +8,7 @@
#include "xyz/openbmc_project/Inventory/Manager/server.hpp"
#include "events.hpp"
#include "actions.hpp"
+#include "types.hpp"
namespace phosphor
{
@@ -76,9 +77,6 @@ class Manager final :
*/
Manager(sdbusplus::bus::bus&&, const char*, const char*, const char*);
- using Object = std::map <
- std::string, std::map <
- std::string, sdbusplus::message::variant<int64_t, std::string >>>;
using EventInfo = std::tuple <
std::vector<details::EventBasePtr>,
std::vector<details::ActionBasePtr >>;
OpenPOWER on IntegriCloud