Use nested namespace

It's a mechanical change to modernize the code base
This commit is contained in:
Dennis Luxen
2022-12-11 10:10:26 +01:00
parent 152a52bc1a
commit a4aa153ba4
456 changed files with 469 additions and 2474 deletions
+1 -7
View File
@@ -9,11 +9,7 @@
#include <utility>
#include <vector>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
namespace
{
@@ -90,6 +86,4 @@ std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &l
return overview_geometry;
}
} // namespace guidance
} // namespace engine
} // namespace osrm
+1 -7
View File
@@ -2,11 +2,7 @@
#include <numeric>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
Route assembleRoute(const std::vector<RouteLeg> &route_legs)
@@ -27,6 +23,4 @@ Route assembleRoute(const std::vector<RouteLeg> &route_legs)
return Route{distance, duration, weight};
}
} // namespace guidance
} // namespace engine
} // namespace osrm
+1 -10
View File
@@ -8,13 +8,7 @@
#include <cmath>
#include <cstddef>
namespace osrm
{
namespace engine
{
namespace guidance
{
namespace detail
namespace osrm::engine::guidance::detail
{
std::pair<short, short> getDepartBearings(const LegGeometry &leg_geometry,
@@ -50,7 +44,4 @@ std::pair<short, short> getArriveBearings(const LegGeometry &leg_geometry,
return std::make_pair<short, short>(
std::round(util::coordinate_calculation::bearing(pre_turn_coordinate, turn_coordinate)), 0);
}
} // namespace detail
} // namespace guidance
} // namespace engine
} // namespace osrm
@@ -6,11 +6,7 @@
#include <boost/assert.hpp>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
using namespace osrm::guidance;
@@ -419,6 +415,4 @@ bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_inte
noIntermediaryIntersections(*step_entering_intersection);
}
} /* namespace guidance */
} /* namespace engine */
} /* namespace osrm */
+1 -7
View File
@@ -10,11 +10,7 @@
#include <boost/assert.hpp>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
using osrm::util::angularDeviation;
using namespace osrm::guidance;
@@ -667,6 +663,4 @@ RouteSteps collapseSegregatedTurnInstructions(RouteSteps steps)
return steps;
}
} // namespace guidance
} // namespace engine
} // namespace osrm
+1 -7
View File
@@ -9,11 +9,7 @@
#include <unordered_set>
#include <utility>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
using namespace osrm::guidance;
@@ -209,6 +205,4 @@ std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps,
return steps;
}
} // namespace guidance
} // namespace engine
} // namespace osrm
+1 -7
View File
@@ -21,11 +21,7 @@
#include <limits>
#include <utility>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
using namespace osrm::guidance;
@@ -718,6 +714,4 @@ void applyOverrides(const datafacade::BaseDataFacade &facade,
}
}
} // namespace guidance
} // namespace engine
} // namespace osrm
+1 -7
View File
@@ -4,11 +4,7 @@
#include <boost/assert.hpp>
#include <iterator>
namespace osrm
{
namespace engine
{
namespace guidance
namespace osrm::engine::guidance
{
using namespace osrm::guidance;
@@ -85,6 +81,4 @@ std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps)
return removeNoTurnInstructions(std::move(steps));
}
} // namespace guidance
} // namespace engine
} // namespace osrm