Skip to content

Commit 2794a52

Browse files
committed
Remove boost::make_unique to fix travis node builds
1 parent cb796e4 commit 2794a52

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ script:
339339
- ./unit_tests/server-tests
340340
- ./unit_tests/partition-tests
341341
- |
342-
if [ -z "${ENABLE_SANITIZER}" ]; then
342+
if [ -z "${ENABLE_SANITIZER}" ] && [ "$TARGET_ARCH" != "i686" ]; then
343343
npm run nodejs-tests
344344
fi
345345
- popd

include/nodejs/node_osrm_support.hpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "osrm/trip_parameters.hpp"
1919

2020
#include <boost/assert.hpp>
21-
#include <boost/make_unique.hpp>
2221
#include <boost/optional.hpp>
2322

2423
#include <algorithm>
@@ -81,7 +80,7 @@ inline void ParseResult(const osrm::Status &result_status, const std::string & /
8180
inline engine_config_ptr argumentsToEngineConfig(const Nan::FunctionCallbackInfo<v8::Value> &args)
8281
{
8382
Nan::HandleScope scope;
84-
auto engine_config = boost::make_unique<osrm::EngineConfig>();
83+
auto engine_config = std::make_unique<osrm::EngineConfig>();
8584

8685
if (args.Length() == 0)
8786
{
@@ -631,7 +630,7 @@ inline route_parameters_ptr
631630
argumentsToRouteParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
632631
bool requires_multiple_coordinates)
633632
{
634-
route_parameters_ptr params = boost::make_unique<osrm::RouteParameters>();
633+
route_parameters_ptr params = std::make_unique<osrm::RouteParameters>();
635634
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
636635
if (!has_base_params)
637636
return route_parameters_ptr();
@@ -681,7 +680,7 @@ argumentsToRouteParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
681680
inline tile_parameters_ptr
682681
argumentsToTileParameters(const Nan::FunctionCallbackInfo<v8::Value> &args, bool /*unused*/)
683682
{
684-
tile_parameters_ptr params = boost::make_unique<osrm::TileParameters>();
683+
tile_parameters_ptr params = std::make_unique<osrm::TileParameters>();
685684

686685
if (args.Length() < 2)
687686
{
@@ -742,7 +741,7 @@ inline nearest_parameters_ptr
742741
argumentsToNearestParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
743742
bool requires_multiple_coordinates)
744743
{
745-
nearest_parameters_ptr params = boost::make_unique<osrm::NearestParameters>();
744+
nearest_parameters_ptr params = std::make_unique<osrm::NearestParameters>();
746745
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
747746
if (!has_base_params)
748747
return nearest_parameters_ptr();
@@ -781,7 +780,7 @@ inline table_parameters_ptr
781780
argumentsToTableParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
782781
bool requires_multiple_coordinates)
783782
{
784-
table_parameters_ptr params = boost::make_unique<osrm::TableParameters>();
783+
table_parameters_ptr params = std::make_unique<osrm::TableParameters>();
785784
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
786785
if (!has_base_params)
787786
return table_parameters_ptr();
@@ -875,7 +874,7 @@ inline trip_parameters_ptr
875874
argumentsToTripParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
876875
bool requires_multiple_coordinates)
877876
{
878-
trip_parameters_ptr params = boost::make_unique<osrm::TripParameters>();
877+
trip_parameters_ptr params = std::make_unique<osrm::TripParameters>();
879878
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
880879
if (!has_base_params)
881880
return trip_parameters_ptr();
@@ -970,7 +969,7 @@ inline match_parameters_ptr
970969
argumentsToMatchParameter(const Nan::FunctionCallbackInfo<v8::Value> &args,
971970
bool requires_multiple_coordinates)
972971
{
973-
match_parameters_ptr params = boost::make_unique<osrm::MatchParameters>();
972+
match_parameters_ptr params = std::make_unique<osrm::MatchParameters>();
974973
bool has_base_params = argumentsToParameter(args, params, requires_multiple_coordinates);
975974
if (!has_base_params)
976975
return match_parameters_ptr();

0 commit comments

Comments
 (0)