diff --git a/src/server/sparkd/md/taifex/TaifexDataHandler.cpp b/src/server/sparkd/md/taifex/TaifexDataHandler.cpp index 3a56b0ce5..02b8299d3 100644 --- a/src/server/sparkd/md/taifex/TaifexDataHandler.cpp +++ b/src/server/sparkd/md/taifex/TaifexDataHandler.cpp @@ -3,13 +3,9 @@ #include "lib/config/config.h" #include "lib/domain/Price.h" #include "lib/domain/Security.h" -<<<<<<< Updated upstream #include "lib/md/IMarketDataListener.h" #include "lib/persistence/IDGenerator.h" -======= -#include "lib/logging/logging.h" ->>>>>>> Stashed changes #include #include #include @@ -1215,7 +1211,6 @@ bool readBinaryFile(const std::string &file_name, //const std::string &filename, void bts::md::taifex::TaifexDatahandler::run( -<<<<<<< Updated upstream bool use_file, std::shared_ptr listner, std::shared_ptr sec_id_store) { @@ -1229,17 +1224,3 @@ void bts::md::taifex::TaifexDatahandler::run( } }//namespace bts::md::taifex -======= - const bool &use_file, - std::shared_ptr listner, - persistence::IDGenerator *sec_id_store) { - std::string file_name = "/reference_data_20240806_1"; - if(use_file){ - std::string base_path = config::get().data_path(); - readBinaryFile(base_path+file_name, listner, sec_id_store); - while(1); - } - // bts_assert_msg(false, "inside run taifex"); - } -}//namespace bts::md::taifex ->>>>>>> Stashed changes