summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Kodihalli <dkodihal@in.ibm.com>2017-06-07 08:34:30 -0500
committerDeepak Kodihalli <dkodihal@in.ibm.com>2017-06-07 13:38:43 +0000
commit193b22826c5a9ba8e6f03861967fe922ce3557ff (patch)
treef12e41131a198df9a41be2b86639c373ab8e7a8e
parent847d6495c39dee2a335c6499d027c50a20fca9a5 (diff)
downloadopenpower-vpd-parser-193b22826c5a9ba8e6f03861967fe922ce3557ff.tar.gz
openpower-vpd-parser-193b22826c5a9ba8e6f03861967fe922ce3557ff.zip
Pass char* to mapper GetObject
Now that openbmc/openbmc#1025 is fixed, mapper's GetObject method can be provided char* type arguments. Previously they had to be converted to std::string to work around bug 1025. Resolves openbmc/openbmc#1131. Change-Id: I3f8a8809a17e866044959989d49ca32e16a8021c Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>
-rw-r--r--types.hpp4
-rw-r--r--utils.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/types.hpp b/types.hpp
index e8350f6..4e30208 100644
--- a/types.hpp
+++ b/types.hpp
@@ -32,8 +32,8 @@ using Object = sdbusplus::message::object_path;
using ObjectMap = std::map<Object, InterfaceMap>;
using namespace std::string_literals;
-static const auto pimPath = "/xyz/openbmc_project/inventory"s;
-static const auto pimIntf = "xyz.openbmc_project.Inventory.Manager"s;
+constexpr auto pimPath = "/xyz/openbmc_project/inventory";
+constexpr auto pimIntf = "xyz.openbmc_project.Inventory.Manager";
} // namespace inventory
diff --git a/utils.cpp b/utils.cpp
index 168f89f..57cba0a 100644
--- a/utils.cpp
+++ b/utils.cpp
@@ -50,8 +50,8 @@ void callPIM(ObjectMap&& objects)
auto bus = sdbusplus::bus::new_default();
auto pimMsg = bus.new_method_call(
service.c_str(),
- pimPath.c_str(),
- pimIntf.c_str(),
+ pimPath,
+ pimIntf,
"Notify");
pimMsg.append(std::move(objects));
auto result = bus.call(pimMsg);
OpenPOWER on IntegriCloud