From cf8a79201d4b3f05c03085a4d454e145fcc29d0f Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 24 Jan 2018 09:00:53 -0500 Subject: [PATCH] Fixed MergeByKey so that it can take references. --- src/server/sparkd/mercury/synopsis/MergeByKey.h | 5 ++++- src/server/sparkd/orderman2/events/StoredFillEvent.h | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/server/sparkd/mercury/synopsis/MergeByKey.h b/src/server/sparkd/mercury/synopsis/MergeByKey.h index 66ca750bf..327af1e4b 100644 --- a/src/server/sparkd/mercury/synopsis/MergeByKey.h +++ b/src/server/sparkd/mercury/synopsis/MergeByKey.h @@ -8,7 +8,10 @@ namespace mercury { template class MergeByKey : public ISynopsisBuilder { public: - using Key = decltype(((EV *)nullptr)->key()); + using RefConstKey = decltype(((EV *)nullptr)->key()); + using ConstKey = typename std::remove_reference::type; + + using Key = typename std::remove_const::type; using TMap = std::unordered_map; MergeByKey() : _synopsis(), _empty(), _dirty() { clear_synopsis(); } diff --git a/src/server/sparkd/orderman2/events/StoredFillEvent.h b/src/server/sparkd/orderman2/events/StoredFillEvent.h index b523f8b7b..61ff0838f 100644 --- a/src/server/sparkd/orderman2/events/StoredFillEvent.h +++ b/src/server/sparkd/orderman2/events/StoredFillEvent.h @@ -15,8 +15,7 @@ public: using SynopsisPolicy = mercury::MergeByKey; StoredFillEvent(api::orderman2::Fill &fill) : fill(&fill) {} - - auto key() const {return fill->fill_key();} + std::string const& key() const {return fill->fill_key();} api::orderman2::Fill *fill; };