diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index c7849f014..36466d961 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -186,7 +186,7 @@ CAPI void api_client_send( void *extra) { LOG(Api, Diag, "send rpc {}", ((int64_t)buffer)); std::string strbuf(buffer, buffer_length); - qbus::RPCRequest request(move(strbuf)); + qbus::RPCRequest request(std::move(strbuf)); api_client_send_internal( pclient, std::move(request), cb, rpc_connect_timeout_ms(), extra); } diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index 954dfc89c..a290f23fa 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -60,7 +60,7 @@ CAPI void api_server_call_callback( reinterpret_cast(ppvhandler); std::string reply_buffer((const char *)buffer, (size_t)length); qbus::RPCReplyPtr replyptr = - std::make_shared(move(reply_buffer)); + std::make_shared(std::move(reply_buffer)); (**pphandler)(replyptr); delete (*pphandler); *pphandler = nullptr; diff --git a/src/lib/api/public/ClientChannel.h b/src/lib/api/public/ClientChannel.h index 343a4581f..c4c6c4e2c 100644 --- a/src/lib/api/public/ClientChannel.h +++ b/src/lib/api/public/ClientChannel.h @@ -72,7 +72,7 @@ class ClientChannel { response_buffer + header_size, response_size - header_size); if (response->ParseFromZeroCopyStream(&data_stream)) { - on_response(Result(move(response))); + on_response(Result(std::move(response))); return; } } else { diff --git a/src/lib/api/public/QuickbusClientChannel.cpp b/src/lib/api/public/QuickbusClientChannel.cpp index d0477a15a..21b6df6b4 100644 --- a/src/lib/api/public/QuickbusClientChannel.cpp +++ b/src/lib/api/public/QuickbusClientChannel.cpp @@ -28,7 +28,7 @@ void QuickbusClientChannel::send_core( (*on_response)(buffer, length); delete on_response; }; - OnReply *heap_on_response = new OnReply(move(on_response)); + OnReply *heap_on_response = new OnReply(std::move(on_response)); api_client_send( _pclient, request_envalope.c_str(), request_envalope.size(), trampoline, heap_on_response); diff --git a/src/lib/api/service_compiler/templates/cpp/client.pb.cc b/src/lib/api/service_compiler/templates/cpp/client.pb.cc index e7c8c9154..eed42eaf4 100644 --- a/src/lib/api/service_compiler/templates/cpp/client.pb.cc +++ b/src/lib/api/service_compiler/templates/cpp/client.pb.cc @@ -11,8 +11,8 @@ using namespace rxcpp::operators; {{#each service}} // Constructor -{{name}}::{{name}}(std::unique_ptr pchannel) : _pchannel(move(pchannel)) {} -{{name}}::{{name}}({{name}}&& other) : _pchannel(move(other._pchannel)) { } +{{name}}::{{name}}(std::unique_ptr pchannel) : _pchannel(std::move(pchannel)) {} +{{name}}::{{name}}({{name}}&& other) : _pchannel(std::move(other._pchannel)) { } {{#each method}} {{#if server_streaming}} diff --git a/src/lib/md/MDConsumer.cpp b/src/lib/md/MDConsumer.cpp index e4d00b7c9..10fabf04c 100644 --- a/src/lib/md/MDConsumer.cpp +++ b/src/lib/md/MDConsumer.cpp @@ -783,7 +783,7 @@ class MDConsumerImpl { // recurse to find details map leg_map; for (auto &leg : fill_leg_details(legs, depth + 1)) { - leg_map.insert(make_pair(leg->id(), move(leg))); + leg_map.insert(make_pair(leg->id(), std::move(leg))); } // diff --git a/src/lib/md/MDProducer.cpp b/src/lib/md/MDProducer.cpp index 97fd372f0..67e28d55f 100644 --- a/src/lib/md/MDProducer.cpp +++ b/src/lib/md/MDProducer.cpp @@ -173,7 +173,7 @@ MDProducerImpl &MDProducer::get_producer( } else { newp.reset(new MDProducerImpl(symbol, type, exchange, _platform, _flags)); } - _producers.push_back(move(newp)); + _producers.push_back(std::move(newp)); return *_producers.back(); } diff --git a/src/lib/md/SecurityIDRecorder.cpp b/src/lib/md/SecurityIDRecorder.cpp index 249551049..e3738809c 100644 --- a/src/lib/md/SecurityIDRecorder.cpp +++ b/src/lib/md/SecurityIDRecorder.cpp @@ -210,7 +210,6 @@ void SecurityIDRecorderState::work_handles() { Security security; MDProducerHandle handle; vector retry; - int count = 0; while (pending_handle.try_pop(handle)) { security.Clear(); // if a spread does not have all of its legs we need to wait @@ -220,7 +219,6 @@ void SecurityIDRecorderState::work_handles() { retry.push_back(handle); } else { convert_security(handle.security(), &security); - ++count; assign_key(security, [handle](const api::Security &security) mutable { handle.set_key(security.id()); }); @@ -254,7 +252,7 @@ void SecurityIDRecorderState::work_db() { // If we're unable to create a descriptor try again later if (descriptor == "") { - defer.push_back(move(temp)); + defer.push_back(std::move(temp)); continue; } @@ -262,10 +260,10 @@ void SecurityIDRecorderState::work_db() { if (key != invalid_security_key) { temp->security.set_id(key); temp->callback(temp->security); - existing_securities.push_back(move(temp)); + existing_securities.push_back(std::move(temp)); } else { // always push in parallel - new_entries.push_back(move(temp)); + new_entries.push_back(std::move(temp)); new_descriptors.push_back(descriptor); ++count; // Limit the amount of time we spend writing to sqlite during startup @@ -279,7 +277,7 @@ void SecurityIDRecorderState::work_db() { for (auto &d : defer) { LOG(md, Info, "SecurityIDRecorderState::work_db work.push d: {}", bts::securities::descriptor(d->security)); - work.push(move(d)); + work.push(std::move(d)); } if (!new_entries.empty()) { diff --git a/src/lib/md/test/md2_tests.cpp b/src/lib/md/test/md2_tests.cpp index 84771864d..22e050876 100644 --- a/src/lib/md/test/md2_tests.cpp +++ b/src/lib/md/test/md2_tests.cpp @@ -1238,7 +1238,7 @@ struct Co2IndexTests { temp->security.mutable_glbx()->set_exchange_id(id); temp->exchange_id = id; temp->handle.key(count); - index.add_security(id, move(temp)); + index.add_security(id, std::move(temp)); } } diff --git a/src/lib/orderman/orderman_utils/BookUtils.cpp b/src/lib/orderman/orderman_utils/BookUtils.cpp index e0fda2ee8..f5eaab6d9 100644 --- a/src/lib/orderman/orderman_utils/BookUtils.cpp +++ b/src/lib/orderman/orderman_utils/BookUtils.cpp @@ -31,13 +31,12 @@ void BookUtils::change_unit_qty( const BookSide& book_in, std::vector& book_out, int unit_qty) { // bts_assert(unit_qty > 0); - int mlev = 0, mlev_qty_used = 0; + int mlev_qty_used = 0; std::vector unit_lev_span; for (uint32_t i = 0; i < book_in.size();) { int mlev_qty_rem = book_in[i].size() - mlev_qty_used; if (mlev_qty_rem == 0) { mlev_qty_used = 0; - mlev++; i++; continue; } @@ -49,7 +48,6 @@ void BookUtils::change_unit_qty( } else { unit_lev_span.emplace_back(book_in[i].int_price(), mlev_qty_rem); mlev_qty_used = 0; - mlev++; i++; } } else { diff --git a/src/lib/utils/SharedMemory.cpp b/src/lib/utils/SharedMemory.cpp index b71238828..4de8f0f68 100644 --- a/src/lib/utils/SharedMemory.cpp +++ b/src/lib/utils/SharedMemory.cpp @@ -74,14 +74,14 @@ struct BoostLowLevelSharedMemoryImpl { void add_region(shared_memory_object block) { mapped_region region(block, block.get_mode()); - _mappings.push_back(make_pair(move(block), move(region))); + _mappings.push_back(make_pair(std::move(block), std::move(region))); } Segment create(const string &name, size_t size) { try { shared_memory_object block(create_only, name.c_str(), read_write); block.truncate(size); - add_region(move(block)); + add_region(std::move(block)); return make_segment(size, _mappings.back().second.get_address()); } catch (...) { return make_segment(0, nullptr); diff --git a/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp b/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp index 203312c73..dab20a8f2 100644 --- a/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp +++ b/src/server/sparkd/cmds/spartan/domain/book/tests/synthetic_book_tests.cpp @@ -395,9 +395,7 @@ void test_synth_book(LegMarkets synth) { // test every permutation of the legs. All permutations of a particular // set of legs should produce the same synthetic book. auto perms = bts::spartan::Permutation::all(synth); - int counter = 0; for (const auto &p : perms) { - counter++; SmallBook book_out; SmallBook book_out_historic; bts::spartan::mdp3::book_utils::compute_synthetic_book(book_out_historic, p, 10); diff --git a/src/server/sparkd/http/ApiGateway.cpp b/src/server/sparkd/http/ApiGateway.cpp index 29ce6ea83..50200c218 100644 --- a/src/server/sparkd/http/ApiGateway.cpp +++ b/src/server/sparkd/http/ApiGateway.cpp @@ -114,7 +114,7 @@ struct ApiGatewayImpl { api_header.AppendToString(&buffer); buffer += body; // call send - Responder *presponder = new Responder(move(reply)); + Responder *presponder = new Responder(std::move(reply)); api_client_send( pclient, buffer.c_str(), buffer.size(), [](const char *buffer, size_t length, void *extra) { @@ -144,10 +144,10 @@ struct ApiGatewayImpl { // call api_client_subscribe() store the TableSubscription and the id and // the reply channel When a tableupate fires attach the id to the reply // and send it over the channel Responder* preply = new - // Responder(move(reply)); + // Responder(std::move(reply)); auto id = request.request_id(); SubscriptionContext *pcontext = - new SubscriptionContext{id, move(reply), nullptr}; + new SubscriptionContext{id, std::move(reply), nullptr}; auto table = api_client_subscribe( pclient, request.method_name().c_str(), diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index 541a4a86e..ac60c42fe 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -104,7 +104,7 @@ void ICEMain::start(std::vector &symbols) { unique_ptr phandler = prepare_handler(channel, license.path.string()); _listeners.push_back(prepare_listener(*phandler, channel)); - _handlers.push_back(std::make_pair(channel, move(phandler))); + _handlers.push_back(std::make_pair(channel, std::move(phandler))); std::stringstream symstr; for (const auto &sym : channel.symbols) diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index d00726545..6f7c94eb5 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -122,7 +122,7 @@ create_feed_engines(const vector &channels) { // Loop through settings and instantiate feed engines for (const auto &s : settings) { unique_ptr temp(new onixs::FeedEngine(s.second)); - result.insert(make_pair(s.first, move(temp))); + result.insert(make_pair(s.first, std::move(temp))); } return result; @@ -168,7 +168,7 @@ void MDP3Main::start( for (const auto &channel : channels) { unique_ptr phandler = prepare_handler(channel.id, mbo); _listeners.push_back(prepare_listener(*phandler, channel, mbo, tssd)); - _handlers.insert(std::make_pair(channel.id, move(phandler))); + _handlers.insert(std::make_pair(channel.id, std::move(phandler))); std::stringstream symstr; for (const auto &sym : channel.symbols) { symstr << sym.symbol() << "-" << SecurityType_Name(sym.type()) << " ";