summaryrefslogtreecommitdiffstats
path: root/xyz/openbmc_project/Inventory
diff options
context:
space:
mode:
authorBrad Bishop <bradleyb@fuzziesquirrel.com>2017-01-15 19:45:40 -0500
committerBrad Bishop <bradleyb@fuzziesquirrel.com>2017-01-16 00:09:10 -0500
commit9aa5e2f2290aa102ea7b537fd126f70433ae0a26 (patch)
tree32ac104b8310dbfeb95646e48aefedcd2d2f64dc /xyz/openbmc_project/Inventory
parent6524758b9cde6b4fd78b690b17e5b9fe7322554e (diff)
downloadphosphor-inventory-manager-9aa5e2f2290aa102ea7b537fd126f70433ae0a26.tar.gz
phosphor-inventory-manager-9aa5e2f2290aa102ea7b537fd126f70433ae0a26.zip
Regenerate manager bindings
Re-run sdbus++ and react to the sdbusplus interface namespace move and a real object path type. Change-Id: Id6241b55cd3f2d4c3b85e5545e4ac6e5dd439e34
Diffstat (limited to 'xyz/openbmc_project/Inventory')
-rw-r--r--xyz/openbmc_project/Inventory/Manager/server.hpp23
1 files changed, 14 insertions, 9 deletions
diff --git a/xyz/openbmc_project/Inventory/Manager/server.hpp b/xyz/openbmc_project/Inventory/Manager/server.hpp
index 9c3118b..302bee5 100644
--- a/xyz/openbmc_project/Inventory/Manager/server.hpp
+++ b/xyz/openbmc_project/Inventory/Manager/server.hpp
@@ -5,14 +5,14 @@
namespace sdbusplus
{
-namespace server
-{
namespace xyz
{
namespace openbmc_project
{
namespace Inventory
{
+namespace server
+{
class Manager
{
@@ -21,15 +21,16 @@ class Manager
* Not allowed:
* - Default constructor to avoid nullptrs.
* - Copy operations due to internal unique_ptr.
+ * - Move operations due to 'this' being registered as the
+ * 'context' with sdbus.
* Allowed:
- * - Move operations.
* - Destructor.
*/
Manager() = delete;
Manager(const Manager&) = delete;
Manager& operator=(const Manager&) = delete;
- Manager(Manager&&) = default;
- Manager& operator=(Manager&&) = default;
+ Manager(Manager&&) = delete;
+ Manager& operator=(Manager&&) = delete;
virtual ~Manager() = default;
/** @brief Constructor to put object onto bus at a dbus path.
@@ -39,6 +40,7 @@ class Manager
Manager(bus::bus& bus, const char* path);
+
/** @brief Implementation for Notify
* Signal the implementing service that an item is ready to have its state managed.
*
@@ -46,8 +48,9 @@ class Manager
* @param[in] object - The fully enumerated item to be managed.
*/
virtual void notify(
- std::string path,
- std::map<std::string, std::map<std::string, sdbusplus::message::variant<std::string>>> object) = 0;
+ sdbusplus::message::object_path path,
+ std::map<std::string, std::map<std::string, sdbusplus::message::variant<int64_t, std::string>>> object) = 0;
+
@@ -61,14 +64,16 @@ class Manager
static constexpr auto _interface = "xyz.openbmc_project.Inventory.Manager";
static const vtable::vtable_t _vtable[];
- interface::interface _xyz_openbmc_project_Inventory_Manager_interface;
+ sdbusplus::server::interface::interface
+ _xyz_openbmc_project_Inventory_Manager_interface;
};
+
+} // namespace server
} // namespace Inventory
} // namespace openbmc_project
} // namespace xyz
-} // namespace server
} // namespace sdbusplus
OpenPOWER on IntegriCloud