summaryrefslogtreecommitdiffstats
path: root/include/ipmid
diff options
context:
space:
mode:
authorJames Feist <james.feist@linux.intel.com>2019-09-06 13:41:59 -0700
committerJames Feist <james.feist@linux.intel.com>2019-09-13 16:26:33 +0000
commitcb09aa00e8f25fda20780f0a26a7c35b24c4b59b (patch)
treebe62c78b8e20d2ecaa5f0d285c8f030e9647a9c2 /include/ipmid
parentcfae948b82765c8dbaec809e0f13744e8dedb934 (diff)
downloadphosphor-host-ipmid-cb09aa00e8f25fda20780f0a26a7c35b24c4b59b.tar.gz
phosphor-host-ipmid-cb09aa00e8f25fda20780f0a26a7c35b24c4b59b.zip
Change yield from ptr to object
The ptr makes for ugly code: i.e. *(ctx->yield) all over the place. Change it to copy as it is just 4 pointers. Tested: ipmitool mc info still works Change-Id: I30c5bc395849875cd58925fac99bb23c1804cd5b Signed-off-by: James Feist <james.feist@linux.intel.com>
Diffstat (limited to 'include/ipmid')
-rw-r--r--include/ipmid/handler.hpp2
-rw-r--r--include/ipmid/message.hpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/ipmid/handler.hpp b/include/ipmid/handler.hpp
index 10b7119..b6c6c0f 100644
--- a/include/ipmid/handler.hpp
+++ b/include/ipmid/handler.hpp
@@ -190,7 +190,7 @@ class IpmiHandler final : public HandlerBase
boost::asio::yield_context>::value)
{
inputArgs.emplace(std::tuple_cat(
- std::forward_as_tuple(*(request->ctx->yield)),
+ std::forward_as_tuple(request->ctx->yield),
std::move(unpackArgs)));
}
else if constexpr (std::is_same<
diff --git a/include/ipmid/message.hpp b/include/ipmid/message.hpp
index 4864f4e..0dc7ca8 100644
--- a/include/ipmid/message.hpp
+++ b/include/ipmid/message.hpp
@@ -43,7 +43,7 @@ struct Context
Context(std::shared_ptr<sdbusplus::asio::connection> bus, NetFn netFn,
Cmd cmd, int channel, int userId, Privilege priv, int rqSA,
- boost::asio::yield_context* yield) :
+ boost::asio::yield_context& yield) :
bus(bus),
netFn(netFn), cmd(cmd), channel(channel), userId(userId), priv(priv),
rqSA(rqSA), yield(yield)
@@ -60,7 +60,7 @@ struct Context
// srcAddr is only set on IPMB requests because
// Platform Event Message needs it to determine the incoming format
int rqSA;
- boost::asio::yield_context* yield;
+ boost::asio::yield_context yield;
};
namespace message
OpenPOWER on IntegriCloud