Unverified Commit 654abe92 authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #678 from ivan1993br/reactor_c++14

Modify reactor.cc to c++14
parents 5f911e35 182e5035
...@@ -342,11 +342,11 @@ public: ...@@ -342,11 +342,11 @@ public:
std::vector<std::shared_ptr<Handler>> std::vector<std::shared_ptr<Handler>>
handlers(const Reactor::Key &key) const override { handlers(const Reactor::Key &key) const override {
const auto [idx, marker] = decodeKey(key); const std::pair<uint32_t, uint32_t> idx_marker = decodeKey(key);
if (marker != KeyMarker) if (idx_marker.second != KeyMarker)
throw std::runtime_error("Invalid key"); throw std::runtime_error("Invalid key");
Reactor::Key originalKey(idx); Reactor::Key originalKey(idx_marker.first);
std::vector<std::shared_ptr<Handler>> res; std::vector<std::shared_ptr<Handler>> res;
res.reserve(workers_.size()); res.reserve(workers_.size());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment