Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove boost::make_unique to fix travis node builds

Browse Source
This commit is contained in:
Patrick Niklaus 2017-04-13 11:52:07 +00:00 committed by Patrick Niklaus
parent 5bbc675c6b
commit b422b636d3
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -338,7 +338,7 @@ script:
- ./unit_tests/server-tests - ./unit_tests/server-tests
- ./unit_tests/partition-tests - ./unit_tests/partition-tests
- | - |
if [ -z "${ENABLE_SANITIZER}" ]; then if [ -z "${ENABLE_SANITIZER}" ] && [ "$TARGET_ARCH" != "i686" ]; then
npm run nodejs-tests npm run nodejs-tests
fi fi
- popd - popd

15
include/nodejs/node_osrm_support.hpp
View File

@ -18,7 +18,6 @@
#include "osrm/trip_parameters.hpp" #include "osrm/trip_parameters.hpp"
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/make_unique.hpp>
#include <boost/optional.hpp> #include <boost/optional.hpp>
#include <algorithm> #include <algorithm>
@ -81,7 +80,7 @@ inline void ParseResult(const osrm::Status &result_status, const std::string & /
inline engine_config_ptr argumentsToEngineConfig(const Nan::FunctionCallbackInfo<v8::Value> &args) inline engine_config_ptr argumentsToEngineConfig(const Nan::FunctionCallbackInfo<v8::Value> &args)
{ {
Nan::HandleScope scope; Nan::HandleScope scope;
auto engine_config = boost::make_unique<osrm::EngineConfig>(); auto engine_config = std::make_unique<osrm::EngineConfig>();
if (args.Length() == 0) if (args.Length() == 0)
{ {
@ -631,7 +630,7 @@ inline route_parameters_ptr
argumentsToRouteParameter(const Nan::FunctionCallbackInfo<v8::Value> &args, argumentsToRouteParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
bool requires_multiple_coordinates) bool requires_multiple_coordinates)
{ {
route_parameters_ptr params = boost::make_unique<osrm::RouteParameters>(); route_parameters_ptr params = std::make_unique<osrm::RouteParameters>();
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates); bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
if (!has_base_params) if (!has_base_params)
return route_parameters_ptr(); return route_parameters_ptr();
@ -681,7 +680,7 @@ argumentsToRouteParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
inline tile_parameters_ptr inline tile_parameters_ptr
argumentsToTileParameters(const Nan::FunctionCallbackInfo<v8::Value> &args, bool /*unused*/) argumentsToTileParameters(const Nan::FunctionCallbackInfo<v8::Value> &args, bool /*unused*/)
{ {
tile_parameters_ptr params = boost::make_unique<osrm::TileParameters>(); tile_parameters_ptr params = std::make_unique<osrm::TileParameters>();
if (args.Length() < 2) if (args.Length() < 2)
{ {
@ -742,7 +741,7 @@ inline nearest_parameters_ptr
argumentsToNearestParameter(const Nan::FunctionCallbackInfo<v8::Value> &args, argumentsToNearestParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
bool requires_multiple_coordinates) bool requires_multiple_coordinates)
{ {
nearest_parameters_ptr params = boost::make_unique<osrm::NearestParameters>(); nearest_parameters_ptr params = std::make_unique<osrm::NearestParameters>();
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates); bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
if (!has_base_params) if (!has_base_params)
return nearest_parameters_ptr(); return nearest_parameters_ptr();
@ -781,7 +780,7 @@ inline table_parameters_ptr
argumentsToTableParameter(const Nan::FunctionCallbackInfo<v8::Value> &args, argumentsToTableParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
bool requires_multiple_coordinates) bool requires_multiple_coordinates)
{ {
table_parameters_ptr params = boost::make_unique<osrm::TableParameters>(); table_parameters_ptr params = std::make_unique<osrm::TableParameters>();
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates); bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
if (!has_base_params) if (!has_base_params)
return table_parameters_ptr(); return table_parameters_ptr();
@ -875,7 +874,7 @@ inline trip_parameters_ptr
argumentsToTripParameter(const Nan::FunctionCallbackInfo<v8::Value> &args, argumentsToTripParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
bool requires_multiple_coordinates) bool requires_multiple_coordinates)
{ {
trip_parameters_ptr params = boost::make_unique<osrm::TripParameters>(); trip_parameters_ptr params = std::make_unique<osrm::TripParameters>();
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates); bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
if (!has_base_params) if (!has_base_params)
return trip_parameters_ptr(); return trip_parameters_ptr();
@ -970,7 +969,7 @@ inline match_parameters_ptr
argumentsToMatchParameter(const Nan::FunctionCallbackInfo<v8::Value> &args, argumentsToMatchParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
bool requires_multiple_coordinates) bool requires_multiple_coordinates)
{ {
match_parameters_ptr params = boost::make_unique<osrm::MatchParameters>(); match_parameters_ptr params = std::make_unique<osrm::MatchParameters>();
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates); bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
if (!has_base_params) if (!has_base_params)
return match_parameters_ptr(); return match_parameters_ptr();