From e6059170837585b6c9b76b198501be31c16adadf Mon Sep 17 00:00:00 2001 From: Michael Krasnyk Date: Tue, 16 May 2017 16:32:50 +0200 Subject: [PATCH] Changed some assert to OSRM_ASSERT --- src/extractor/edge_based_graph_factory.cpp | 3 ++- src/extractor/guidance/intersection_generator.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/extractor/edge_based_graph_factory.cpp b/src/extractor/edge_based_graph_factory.cpp index 1a7094662..52e2e8ca8 100644 --- a/src/extractor/edge_based_graph_factory.cpp +++ b/src/extractor/edge_based_graph_factory.cpp @@ -8,6 +8,7 @@ #include "storage/io.hpp" +#include "util/assert.hpp" #include "util/bearing.hpp" #include "util/coordinate.hpp" #include "util/coordinate_calculation.hpp" @@ -419,7 +420,7 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedEdges( auto intersection = turn_analysis.AssignTurnTypes( node_along_road_entering, incoming_edge, intersection_with_flags_and_angles); - BOOST_ASSERT(intersection.valid()); + OSRM_ASSERT(intersection.valid(), m_coordinates[node_at_center_of_intersection]); intersection = turn_lane_handler.assignTurnLanes( node_along_road_entering, incoming_edge, std::move(intersection)); diff --git a/src/extractor/guidance/intersection_generator.cpp b/src/extractor/guidance/intersection_generator.cpp index f1421fc10..2a9965716 100644 --- a/src/extractor/guidance/intersection_generator.cpp +++ b/src/extractor/guidance/intersection_generator.cpp @@ -3,6 +3,7 @@ #include "extractor/geojson_debug_policies.hpp" #include "util/geojson_debug_logger.hpp" +#include "util/assert.hpp" #include "util/bearing.hpp" #include "util/coordinate_calculation.hpp" #include "util/log.hpp" @@ -369,8 +370,9 @@ IntersectionView IntersectionGenerator::TransformIntersectionShapeIntoView( std::end(intersection_view), std::mem_fn(&IntersectionViewData::CompareByAngle)); - BOOST_ASSERT(intersection_view[0].angle >= 0. && - intersection_view[0].angle < std::numeric_limits::epsilon()); + OSRM_ASSERT(intersection_view[0].angle >= 0. && + intersection_view[0].angle < std::numeric_limits::epsilon(), + coordinates[node_at_intersection]); return intersection_view; }