Use nested namespace

It's a mechanical change to modernize the code base

include/engine/routing_algorithms/alternative_path.hpp

@@ -9,11 +9,7 @@
 
 #include "util/exception.hpp"
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 InternalManyRoutesResult alternativePathSearch(SearchEngineData<ch::Algorithm> &search_engine_data,
@@ -26,8 +22,6 @@ InternalManyRoutesResult alternativePathSearch(SearchEngineData<mld::Algorithm>
                                                const PhantomEndpointCandidates &endpoint_candidates,
                                                unsigned number_of_alternatives);
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/routing_algorithms/direct_shortest_path.hpp

@@ -8,11 +8,7 @@
 
 #include "util/typedefs.hpp"
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 /// This is a stripped down version of the general shortest path algorithm.
@@ -26,8 +22,6 @@ InternalRouteResult directShortestPathSearch(SearchEngineData<Algorithm> &engine
                                              const DataFacade<Algorithm> &facade,
                                              const PhantomEndpointCandidates &endpoint_candidates);
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif /* DIRECT_SHORTEST_PATH_HPP */

include/engine/routing_algorithms/many_to_many.hpp

@@ -9,11 +9,7 @@
 
 #include <vector>
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 namespace
 {
@@ -99,8 +95,6 @@ manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
                  const std::vector<std::size_t> &target_indices,
                  const bool calculate_distance);
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/routing_algorithms/map_matching.hpp

@@ -8,11 +8,7 @@
 
 #include <vector>
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 using CandidateList = std::vector<PhantomNodeWithDistance>;
@@ -31,8 +27,6 @@ SubMatchingList mapMatching(SearchEngineData<Algorithm> &engine_working_data,
                             const std::vector<boost::optional<double>> &trace_gps_precision,
                             const bool allow_splitting);
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif /* MAP_MATCHING_HPP */

include/engine/routing_algorithms/routing_base.hpp

@@ -27,12 +27,7 @@
 #include <utility>
 #include <vector>
 
-namespace osrm
-{
-namespace engine
-{
-
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 namespace details
@@ -421,8 +416,6 @@ template <typename FacadeT> EdgeDistance computeEdgeDistance(const FacadeT &faca
     return total_distance;
 }
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_ROUTING_BASE_HPP

include/engine/routing_algorithms/routing_base_ch.hpp

@@ -10,15 +10,7 @@
 
 #include <boost/assert.hpp>
 
-namespace osrm
-{
-namespace engine
-{
-
-namespace routing_algorithms
-{
-
-namespace ch
+namespace osrm::engine::routing_algorithms::ch
 {
 
 // Stalling
@@ -522,9 +514,6 @@ std::tuple<EdgeMetric, EdgeDistance> getLoopMetric(const DataFacade<Algorithm> &
     }
     return std::make_tuple(loop_metric, loop_distance);
 }
-} // namespace ch
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_ROUTING_BASE_CH_HPP

include/engine/routing_algorithms/routing_base_mld.hpp

@@ -16,13 +16,7 @@
 #include <tuple>
 #include <vector>
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
-{
-namespace mld
+namespace osrm::engine::routing_algorithms::mld
 {
 
 namespace
@@ -655,9 +649,6 @@ double getNetworkDistance(SearchEngineData<Algorithm> &engine_working_data,
     return getPathDistance(facade, unpacked_path, source_phantom, target_phantom);
 }
 
-} // namespace mld
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_ROUTING_BASE_MLD_HPP

include/engine/routing_algorithms/shortest_path.hpp

@@ -6,11 +6,7 @@
 #include "engine/search_engine_data.hpp"
 #include "util/typedefs.hpp"
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 template <typename Algorithm>
@@ -20,8 +16,6 @@ shortestPathSearch(SearchEngineData<Algorithm> &engine_working_data,
                    const std::vector<PhantomNodeCandidates> &waypoint_candidates,
                    const boost::optional<bool> continue_straight_at_waypoint);
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif /* OSRM_SHORTEST_PATH_HPP */

include/engine/routing_algorithms/shortest_path_impl.hpp

@@ -6,11 +6,7 @@
 #include <boost/assert.hpp>
 #include <boost/optional.hpp>
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 namespace
@@ -789,8 +785,6 @@ shortestPathSearch(SearchEngineData<Algorithm> &engine_working_data,
     }
 }
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif /* OSRM_SHORTEST_PATH_IMPL_HPP */

include/engine/routing_algorithms/tile_turns.hpp

@@ -9,11 +9,7 @@
 
 #include <vector>
 
-namespace osrm
-{
-namespace engine
-{
-namespace routing_algorithms
+namespace osrm::engine::routing_algorithms
 {
 
 // Used to accumulate all the information we want in the tile about a turn.
@@ -37,8 +33,6 @@ std::vector<TurnData> getTileTurns(const DataFacade<mld::Algorithm> &facade,
                                    const std::vector<RTreeLeaf> &edges,
                                    const std::vector<std::size_t> &sorted_edge_indexes);
 
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif