Use nested namespace

It's a mechanical change to modernize the code base
2022-12-11 10:10:26 +01:00
parent 152a52bc1a
commit a4aa153ba4
456 changed files with 469 additions and 2474 deletions
@@ -16,11 +16,7 @@
 #include <utility>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {
 // Extracts the geometry for each segment and calculates the traveled distance
 // Combines the geometry form the phantom node with the PathData
@@ -172,8 +168,6 @@ inline LegGeometry assembleGeometry(const datafacade::BaseDataFacade &facade,

    return geometry;
 }
-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -23,11 +23,7 @@
 #include <utility>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {
 namespace detail
 {
@@ -232,8 +228,6 @@ inline RouteLeg assembleLeg(const datafacade::BaseDataFacade &facade,
                    {}};
 }

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif // ENGINE_GUIDANCE_SEGMENT_LIST_HPP_
@@ -7,18 +7,12 @@

 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &leg_geometries,
                                               const bool use_simplification);

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -6,17 +6,11 @@

 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 Route assembleRoute(const std::vector<RouteLeg> &route_legs);

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -22,11 +22,7 @@
 #include <guidance/turn_bearing.hpp>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {
 namespace detail
 {
@@ -365,8 +361,6 @@ inline std::vector<RouteStep> assembleSteps(const datafacade::BaseDataFacade &fa
    return steps;
 }

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif // ENGINE_GUIDANCE_SEGMENT_LIST_HPP_
@@ -4,11 +4,7 @@
 #include "engine/guidance/collapsing_utility.hpp"
 #include "engine/guidance/route_step.hpp"

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // check basic collapse preconditions (mode ok, no roundabout types);
@@ -87,8 +83,6 @@ bool doubleChoiceless(const RouteStepIterator step_entering_intersection,
 bool straightTurnFollowedByChoiceless(const RouteStepIterator step_entering_intersection,
                                      const RouteStepIterator step_leaving_intersection);

-} /* namespace guidance */
-} /* namespace engine */
 } /* namespace osrm */

 #endif /* OSRM_ENGINE_GUIDANCE_COLLAPSE_SCENARIO_DETECTION_HPP_ */
@@ -6,11 +6,7 @@
 #include <type_traits>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // Multiple possible reasons can result in unnecessary/confusing instructions
@@ -162,8 +158,6 @@ void combineRouteSteps(RouteStep &step_at_turn_location,
 // alias for suppressing a step, using CombineRouteStep with NoModificationStrategy only
 void suppressStep(RouteStep &step_at_turn_location, RouteStep &step_after_turn_location);

-} /* namespace guidance */
-} // namespace engine
 } /* namespace osrm */

 #endif /* OSRM_ENGINE_GUIDANCE_COLLAPSE_HPP_ */
@@ -10,11 +10,7 @@
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <cstddef>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 using RouteSteps = std::vector<RouteStep>;
@@ -302,8 +298,6 @@ inline bool hasStraightestTurn(const RouteStep &step)
    return false;
 }

-} /* namespace guidance */
-} /* namespace engine */
 } /* namespace osrm */

 #endif /* OSRM_ENGINE_GUIDANCE_COLLAPSING_UTILITY_HPP_ */
@@ -6,11 +6,7 @@
 #include "engine/guidance/route_step.hpp"
 #include "util/attributes.hpp"

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // Constrains lanes for multi-hop situations where lane changes depend on earlier ones.
@@ -22,8 +18,6 @@ OSRM_ATTR_WARN_UNUSED
 std::vector<RouteStep> anticipateLaneChange(std::vector<RouteStep> steps,
                                            const double min_distance_needed_for_lane_change = 200);

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif /* OSRM_ENGINE_GUIDANCE_LANE_PROCESSING_HPP_ */
@@ -12,11 +12,7 @@
 #include <cstdlib>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // locations 0---1---2-...-n-1---n
@@ -64,8 +60,6 @@ struct LegGeometry
        return segment_offsets.size() - 1;
    }
 };
-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -9,11 +9,7 @@

 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // passed as none-reference to modify in-place and move out again
@@ -58,8 +54,6 @@ void applyOverrides(const datafacade::BaseDataFacade &facade,
                    std::vector<RouteStep> &steps,
                    const LegGeometry &geometry);

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif // ENGINE_GUIDANCE_POST_PROCESSING_HPP
@@ -7,11 +7,7 @@
 #include <iterator>
 #include <utility>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // Runs fn on RouteStep sub-ranges determined to be roundabouts.
@@ -46,8 +42,6 @@ template <typename Iter, typename Fn> inline Fn forEachRoundabout(Iter first, It
    return fn;
 }

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif /* OSRM_ENGINE_GUIDANCE_POSTPROCESSING_TOOLKIT_HPP_ */
@@ -1,11 +1,7 @@
 #ifndef ROUTE_HPP
 #define ROUTE_HPP

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 struct Route
@@ -14,8 +10,6 @@ struct Route
    double duration;
    double weight;
 };
-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -8,11 +8,7 @@
 #include <string>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 struct RouteLeg
@@ -23,8 +19,6 @@ struct RouteLeg
    std::string summary;
    std::vector<RouteStep> steps;
 };
-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -16,11 +16,7 @@

 #include <boost/range/iterator_range.hpp>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {
 // Given the following turn from a,b to b,c over b:
 //  a --> b --> c
@@ -234,8 +230,6 @@ inline auto RouteStep::LanesToTheRight() const
    return boost::make_iterator_range(description.end() - num_lanes_right, description.end());
 }

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif
@@ -8,11 +8,7 @@
 #include <string>
 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 enum class WaypointType : std::uint8_t
@@ -44,7 +40,5 @@ inline StepManeuver getInvalidStepManeuver()
            0};
 }

-} // namespace guidance
-} // namespace engine
 } // namespace osrm
 #endif
@@ -6,11 +6,7 @@

 #include <vector>

-namespace osrm
-{
-namespace engine
-{
-namespace guidance
+namespace osrm::engine::guidance
 {

 // Name changes on roads are posing relevant information. However if they are short, we don't want
@@ -20,8 +16,6 @@ namespace guidance
 OSRM_ATTR_WARN_UNUSED
 std::vector<RouteStep> suppressShortNameSegments(std::vector<RouteStep> steps);

-} // namespace guidance
-} // namespace engine
 } // namespace osrm

 #endif /* OSRM_ENGINE_GUIDANCE_VERBOSITY_REDUCTION_HPP_ */