remove util self-written make_unique and use C++14 stdlib make_uniqe
This commit is contained in:
committed by
Daniel J. H
parent
ef1f14550f
commit
d0c142b9c7
@@ -4,7 +4,6 @@
|
||||
#include "util/exception.hpp"
|
||||
#include "util/fingerprint.hpp"
|
||||
#include "util/graph_loader.hpp"
|
||||
#include "util/make_unique.hpp"
|
||||
#include "util/simple_logger.hpp"
|
||||
#include "util/static_graph.hpp"
|
||||
#include "util/typedefs.hpp"
|
||||
@@ -125,7 +124,7 @@ int main(int argc, char *argv[])
|
||||
osrm::util::SimpleLogger().Write() << "Starting SCC graph traversal";
|
||||
|
||||
auto tarjan =
|
||||
osrm::util::make_unique<osrm::extractor::TarjanSCC<osrm::tools::TarjanGraph>>(graph);
|
||||
std::make_unique<osrm::extractor::TarjanSCC<osrm::tools::TarjanGraph>>(graph);
|
||||
tarjan->Run();
|
||||
osrm::util::SimpleLogger().Write() << "identified: " << tarjan->GetNumberOfComponents()
|
||||
<< " many components";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
#include "server/server.hpp"
|
||||
#include "util/make_unique.hpp"
|
||||
#include "util/simple_logger.hpp"
|
||||
#include "util/version.hpp"
|
||||
|
||||
@@ -25,6 +24,7 @@
|
||||
#include <new>
|
||||
#include <string>
|
||||
#include <thread>
|
||||
#include <memory>
|
||||
|
||||
#ifdef _WIN32
|
||||
boost::function0<void> console_ctrl_function;
|
||||
@@ -318,7 +318,7 @@ int main(int argc, const char *argv[]) try
|
||||
#endif
|
||||
|
||||
auto routing_server = server::Server::CreateServer(ip_address, ip_port, requested_thread_num);
|
||||
auto service_handler = util::make_unique<server::ServiceHandler>(config);
|
||||
auto service_handler = std::make_unique<server::ServiceHandler>(config);
|
||||
|
||||
routing_server->RegisterServiceHandler(std::move(service_handler));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user