From 9ff4c81a11ca5e35c81658b4e434cd0554047dbc Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 31 Dec 2020 12:15:24 -0500 Subject: [PATCH] More refactor. --- .../cmds/spartan/md/mdp3/common/InstrumentSnapshot.h | 2 -- .../spartan/md/mdp3/common/InstrumentSnapshotPtr.h | 8 ++++++++ .../sparkd/cmds/spartan/md/mdp3/common/SnapshotMap.h | 11 +++++++++++ .../sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h | 1 - .../cmds/spartan/md/mdp3/realtime/RealTimeHandler.h | 2 ++ .../cmds/spartan/md/mdp3/recovery/RecoveryHandler.h | 2 ++ 6 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshotPtr.h create mode 100644 src/server/sparkd/cmds/spartan/md/mdp3/common/SnapshotMap.h diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h index 0e74edc2d..cb101a463 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshot.h @@ -114,8 +114,6 @@ class InstrumentSnapshot { std::unique_ptr me; }; -using SnapshotMap = - std::unordered_map; std::ostream &operator<<(std::ostream &, InstrumentSnapshot const &); } // namespace bts::spartan::mdp3 diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshotPtr.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshotPtr.h new file mode 100644 index 000000000..746f65e74 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshotPtr.h @@ -0,0 +1,8 @@ +#pragma once + +#include + +namespace bts::spartan::mdp3 { +class InstrumentSnapshot; +using InstrumentSnapshotPtr = std::unique_ptr; +} diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/SnapshotMap.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/SnapshotMap.h new file mode 100644 index 000000000..de0799d46 --- /dev/null +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/SnapshotMap.h @@ -0,0 +1,11 @@ +#pragma once + +#include "server/sparkd/cmds/spartan/common/SecurityID.h" + +namespace bts::spartan::mdp3 { +class InstrumentSnapshot; + +using SnapshotMap = + std::unordered_map; + +} diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h b/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h index 662a91125..9f02be132 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/common/mdp3_common.h @@ -18,7 +18,6 @@ namespace bts::spartan::mdp3 { class InstrumentSnapshot; -using InstrumentSnapshotPtr = std::unique_ptr; class MDP3Event { public: diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/realtime/RealTimeHandler.h b/src/server/sparkd/cmds/spartan/md/mdp3/realtime/RealTimeHandler.h index 60c211590..ee1c996b4 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/realtime/RealTimeHandler.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/realtime/RealTimeHandler.h @@ -1,6 +1,8 @@ #pragma once #include "../common/mdp3_common.h" +#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshotPtr.h" + #include #include diff --git a/src/server/sparkd/cmds/spartan/md/mdp3/recovery/RecoveryHandler.h b/src/server/sparkd/cmds/spartan/md/mdp3/recovery/RecoveryHandler.h index 558fb15e1..b6710dd17 100644 --- a/src/server/sparkd/cmds/spartan/md/mdp3/recovery/RecoveryHandler.h +++ b/src/server/sparkd/cmds/spartan/md/mdp3/recovery/RecoveryHandler.h @@ -1,6 +1,8 @@ #pragma once #include "../common/mdp3_common.h" +#include "server/sparkd/cmds/spartan/md/mdp3/common/InstrumentSnapshotPtr.h" + #include #include