diff --git a/src/lib/collections/UnorderedSetMap.h b/src/lib/collections/UnorderedSetMap.h index 6f0d3e77b..2b2178d8e 100644 --- a/src/lib/collections/UnorderedSetMap.h +++ b/src/lib/collections/UnorderedSetMap.h @@ -16,18 +16,28 @@ class UnorderedSetMap { template using AllSame = std::enable_if_t...>>; + struct AddResult { + typename Data::iterator iterator; + bool added_key; + std::size_t count; + }; + + struct RemoveResult { + typename Data::iterator iterator; + bool removed_key; + std::size_t count; + }; + std::size_t size() const; std::size_t size(Key key) const; template > - std::tuple add( - Key key, ValuesToAdd... values); + AddResult add(Key key, ValuesToAdd... values); template < typename... ValuesToRemove, typename = AllSame> - std::tuple remove( - Key key, ValuesToRemove... values); + RemoveResult remove(Key key, ValuesToRemove... values); private: Data data_; @@ -51,10 +61,7 @@ std::size_t UnorderedSetMap::size( template template -std::tuple< - typename UnorderedSetMap::Data::iterator, - bool, - std::size_t> +typename UnorderedSetMap::AddResult UnorderedSetMap::add( Key key, ValuesToAdd... values) { auto [it, is_new] = data_.try_emplace(key); @@ -62,20 +69,17 @@ UnorderedSetMap::add( auto sz_before = val_set.size(); [](...) {}((val_set.insert(values))...); std::size_t n_added = val_set.size() - sz_before; - return std::make_tuple(it, is_new, n_added); + return {it, is_new, n_added}; } template template -std::tuple< - typename UnorderedSetMap::Data::iterator, - bool, - std::size_t> +typename UnorderedSetMap::RemoveResult UnorderedSetMap::remove( Key key, ValuesToRemove... values) { auto it = data_.find(key); if (it == data_.end()) { - return std::make_tuple(it, false, std::size_t(0)); + return {it, false, std::size_t(0)}; } auto &val_set = it->second; auto sz_before = val_set.size(); @@ -86,7 +90,7 @@ UnorderedSetMap::remove( data_.erase(it); it = data_.end(); } - return std::make_tuple(it, remove_key, n_removed); + return {it, remove_key, n_removed}; } } // namespace bts::collections diff --git a/src/lib/md/binance/BinanceDepthStreamSite.h b/src/lib/md/binance/BinanceDepthStreamSite.h index 008163d28..9189f1e8e 100644 --- a/src/lib/md/binance/BinanceDepthStreamSite.h +++ b/src/lib/md/binance/BinanceDepthStreamSite.h @@ -111,8 +111,8 @@ void BinanceDepthStreamSite::subscribe( "Cannot subscribe. Listener already subscribed to sec. sid: " "{}; sym: {}", sym, sid); - auto [it, is_new_sym, _] = sec_listeners_().add(sid, listener_id); - if (is_new_sym) { + auto res = sec_listeners_().add(sid, listener_id); + if (res.added_key) { ensure_connect_(); // first subscription for this symbol binance_->add_symbol(sym); @@ -137,8 +137,8 @@ void BinanceDepthStreamSite::unsubscribe( "Cannot unsubscribe. Listener not subscribed to sec. sid: {}; " "sym: {}", sid, sym); - auto [it, removed_sym, _] = sec_listeners_().remove(sid, listener_id); - if (removed_sym) { + auto res = sec_listeners_().remove(sid, listener_id); + if (res.removed_key) { binance_->remove_symbol(sym); } }