From ee330fdf6d1532fd19c8be047f4cd19146eca7a5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sun, 2 Oct 2022 02:28:06 -0400 Subject: [PATCH] build: Benign changes to remove errors in gcc 12 --- src/lib/md/SecurityIndex.h | 6 +++--- src/lib/utils/SecureLogon.cpp | 2 ++ src/server/sparkd/md/platforms/emumba/EmMDListener.cpp | 5 +++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/md/SecurityIndex.h b/src/lib/md/SecurityIndex.h index 37658f24c..704a2aae1 100644 --- a/src/lib/md/SecurityIndex.h +++ b/src/lib/md/SecurityIndex.h @@ -133,10 +133,10 @@ class ConcurrentSecurityIndex { // support std::move accessor->second = entry.release(); return accessor->second; - } else { - LOG(md, Error, "Found duplicate entry for platform id '{}' - ", key); - bts_assert(false); } + LOG(md, Error, "Found duplicate entry for platform id '{}' - ", key); + bts_assert(false); + return nullptr; } SecurityData *add_security(ExchangeKey key, MDProducerHandle &handle) { diff --git a/src/lib/utils/SecureLogon.cpp b/src/lib/utils/SecureLogon.cpp index 52413c699..7fc1bbe32 100644 --- a/src/lib/utils/SecureLogon.cpp +++ b/src/lib/utils/SecureLogon.cpp @@ -93,6 +93,7 @@ std::tuple load_session_keys(const string &session) { string error = "Failed to find secure logon key for session: " + session; bts_assert_msg(false, error); + return {"", ""}; } LogonData calculate_hmac( @@ -127,6 +128,7 @@ LogonData calculate_hmac( bts_assert_msg(false, e.what()); } bts_assert(false); + return {}; } // TEST_CASE("LoadSessionKeys", "") { diff --git a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp index 4f18f7ba8..29bb8ac87 100644 --- a/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp +++ b/src/server/sparkd/md/platforms/emumba/EmMDListener.cpp @@ -412,7 +412,8 @@ bts::orderman::OpResult EmMDListener::launch_new_order( me->order_acc_map.insert({ord_key.value(), trading_session}); auto bts_sec_key = sec_ptr->handle.security().key; me->order_state_map.insert( - {ord_key.value(), {bts_sec_key, order.order_def.order_side}}); + {static_cast(ord_key.value()), + {bts_sec_key, order.order_def.order_side}}); LOG(OrderMan, Info, "IEMOrderMuxer::launch_new_order em_ord_key: {} sec_key: {} tid: {} " "sec: {} p: {} " @@ -1210,4 +1211,4 @@ double EmMDListener::_estimate_leg_fill(security_key key, api::Side side) { /* #endregion */ -} // namespace bts::md \ No newline at end of file +} // namespace bts::md