Use nested namespace

It's a mechanical change to modernize the code base

.clang-tidy

@@ -49,6 +49,8 @@ Checks: >
     -misc-misplaced-const,
     -misc-definitions-in-headers,
     -misc-unused-parameters,
+    modernize-concat-nested-namespaces,
+    modernize-use-using,
     performance-*,
     -performance-noexcept-move-constructor,
     -performance-no-int-to-ptr,

include/contractor/contract_excludable_graph.hpp

@@ -7,9 +7,7 @@
 #include "contractor/graph_contractor_adaptors.hpp"
 #include "contractor/query_graph.hpp"
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 using GraphAndFilter = std::tuple<QueryGraph, std::vector<std::vector<bool>>>;
@@ -94,7 +92,6 @@ inline auto contractExcludableGraph(ContractorGraph contractor_graph_,
     return GraphAndFilter{QueryGraph{num_nodes, edge_container.edges},
                           edge_container.MakeEdgeFilters()};
 }
-} // namespace contractor
 } // namespace osrm
 
 #endif

include/contractor/contracted_edge_container.hpp

@@ -14,9 +14,7 @@
 #include <numeric>
 #include <vector>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 struct ContractedEdgeContainer
@@ -164,7 +162,6 @@ struct ContractedEdgeContainer
     std::vector<MergedFlags> flags;
     std::vector<QueryEdge> edges;
 };
-} // namespace contractor
 } // namespace osrm
 
 #endif

include/contractor/contracted_metric.hpp

@@ -3,9 +3,7 @@
 
 #include "contractor/query_graph.hpp"
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 namespace detail
@@ -19,7 +17,6 @@ template <storage::Ownership Ownership> struct ContractedMetric
 
 using ContractedMetric = detail::ContractedMetric<storage::Ownership::Container>;
 using ContractedMetricView = detail::ContractedMetric<storage::Ownership::View>;
-} // namespace contractor
 } // namespace osrm
 
 #endif

include/contractor/contractor.hpp

@@ -30,9 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "contractor/contractor_config.hpp"
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 /// Base class of osrm-contract
@@ -49,7 +47,6 @@ class Contractor
   private:
     ContractorConfig config;
 };
-} // namespace contractor
 } // namespace osrm
 
 #endif // PROCESSING_CHAIN_HPP

include/contractor/contractor_config.hpp

@@ -35,9 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 struct ContractorConfig final : storage::IOConfig
@@ -71,7 +69,6 @@ struct ContractorConfig final : storage::IOConfig
     //(e.g. 0.8 contracts 80 percent of the hierarchy, leaving a core of 20%)
     double core_factor = 1.0;
 };
-} // namespace contractor
 } // namespace osrm
 
 #endif // EXTRACTOR_OPTIONS_HPP

include/contractor/contractor_graph.hpp

@@ -4,9 +4,7 @@
 #include "util/dynamic_graph.hpp"
 #include <algorithm>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 struct ContractorEdgeData
@@ -42,7 +40,6 @@ struct ContractorEdgeData
 using ContractorGraph = util::DynamicGraph<ContractorEdgeData>;
 using ContractorEdge = ContractorGraph::InputEdge;
 
-} // namespace contractor
 } // namespace osrm
 
 #endif // OSRM_CONTRACTOR_CONTRACTOR_GRAPH_HPP_

include/contractor/contractor_heap.hpp

@@ -5,9 +5,7 @@
 #include "util/typedefs.hpp"
 #include "util/xor_fast_hash_storage.hpp"
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 struct ContractorHeapData
 {
@@ -24,7 +22,6 @@ using ContractorHeap = util::QueryHeap<NodeID,
                                        ContractorHeapData,
                                        util::XORFastHashStorage<NodeID, NodeID>>;
 
-} // namespace contractor
 } // namespace osrm
 
 #endif // OSRM_CONTRACTOR_CONTRACTOR_HEAP_HPP_

include/contractor/contractor_search.hpp

@@ -8,9 +8,7 @@
 
 #include <cstddef>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 void search(ContractorHeap &heap,
@@ -20,7 +18,6 @@ void search(ContractorHeap &heap,
             const EdgeWeight weight_limit,
             const NodeID forbidden_node);
 
-} // namespace contractor
 } // namespace osrm
 
 #endif // OSRM_CONTRACTOR_DIJKSTRA_HPP

include/contractor/crc32_processor.hpp

@@ -9,9 +9,7 @@
 
 #include <iterator>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 class IteratorbasedCRC32
@@ -125,7 +123,6 @@ struct RangebasedCRC32
   private:
     IteratorbasedCRC32 crc32;
 };
-} // namespace contractor
 } // namespace osrm
 
 #endif /* ITERATOR_BASED_CRC32_H */

include/contractor/files.hpp

@@ -5,11 +5,7 @@
 
 #include <unordered_map>
 
-namespace osrm
+namespace osrm::contractor::files
-{
-namespace contractor
-{
-namespace files
 {
 // reads .osrm.hsgr file
 template <typename ContractedMetricT>
@@ -52,8 +48,6 @@ inline void writeGraph(const boost::filesystem::path &path,
         serialization::write(writer, "/ch/metrics/" + pair.first, pair.second);
     }
 }
-} // namespace files
-} // namespace contractor
 } // namespace osrm
 
 #endif

include/contractor/graph_contractor.hpp

@@ -8,9 +8,7 @@
 #include <tuple>
 #include <vector>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 std::vector<bool> contractGraph(ContractorGraph &graph,
@@ -37,7 +35,6 @@ inline auto contractGraph(ContractorGraph &graph,
         graph, {}, std::move(node_is_contractable), std::move(node_weights), core_factor);
 }
 
-} // namespace contractor
 } // namespace osrm
 
 #endif // OSRM_CONTRACTOR_GRAPH_CONTRACTOR_HPP

include/contractor/graph_contractor_adaptors.hpp

@@ -10,9 +10,7 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 // Make sure to move in the input edge list!
@@ -177,7 +175,6 @@ template <class Edge, typename GraphT> inline std::vector<Edge> toEdges(GraphT g
     return edges;
 }
 
-} // namespace contractor
 } // namespace osrm
 
 #endif // OSRM_CONTRACTOR_GRAPH_CONTRACTION_ADAPTORS_HPP_

include/contractor/query_edge.hpp

@@ -5,9 +5,7 @@
 
 #include <tuple>
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 struct QueryEdge
@@ -77,7 +75,6 @@ struct QueryEdge
                 data.distance == right.data.distance);
     }
 };
-} // namespace contractor
 } // namespace osrm
 
 #endif // QUERYEDGE_HPP

include/contractor/query_graph.hpp

@@ -6,9 +6,7 @@
 #include "util/static_graph.hpp"
 #include "util/typedefs.hpp"
 
-namespace osrm
+namespace osrm::contractor
-{
-namespace contractor
 {
 
 namespace detail
@@ -19,7 +17,6 @@ using QueryGraph = util::StaticGraph<typename QueryEdge::EdgeData, Ownership>;
 
 using QueryGraph = detail::QueryGraph<storage::Ownership::Container>;
 using QueryGraphView = detail::QueryGraph<storage::Ownership::View>;
-} // namespace contractor
 } // namespace osrm
 
 #endif // QUERYEDGE_HPP

include/contractor/serialization.hpp

@@ -8,11 +8,7 @@
 #include "storage/serialization.hpp"
 #include "storage/tar.hpp"
 
-namespace osrm
+namespace osrm::contractor::serialization
-{
-namespace contractor
-{
-namespace serialization
 {
 
 template <storage::Ownership Ownership>
@@ -46,8 +42,6 @@ void read(storage::tar::FileReader &reader,
                                      metric.edge_filter[index]);
     }
 }
-} // namespace serialization
-} // namespace contractor
 } // namespace osrm
 
 #endif

include/customizer/cell_customizer.hpp

@@ -10,9 +10,7 @@
 
 #include <unordered_set>
 
-namespace osrm
+namespace osrm::customizer
-{
-namespace customizer
 {
 
 class CellCustomizer
@@ -235,7 +233,6 @@ class CellCustomizer
 
     const partitioner::MultiLevelPartition &partition;
 };
-} // namespace customizer
 } // namespace osrm
 
 #endif // OSRM_CELLS_CUSTOMIZER_HPP

include/customizer/cell_metric.hpp

@@ -7,9 +7,7 @@
 #include "util/typedefs.hpp"
 #include "util/vector_view.hpp"
 
-namespace osrm
+namespace osrm::customizer
-{
-namespace customizer
 {
 namespace detail
 {
@@ -26,7 +24,6 @@ template <storage::Ownership Ownership> struct CellMetricImpl
 
 using CellMetric = detail::CellMetricImpl<storage::Ownership::Container>;
 using CellMetricView = detail::CellMetricImpl<storage::Ownership::View>;
-} // namespace customizer
 } // namespace osrm
 
 #endif

include/customizer/customizer.hpp

@@ -3,9 +3,7 @@
 
 #include "customizer/customizer_config.hpp"
 
-namespace osrm
+namespace osrm::customizer
-{
-namespace customizer
 {
 
 class Customizer
@@ -14,7 +12,6 @@ class Customizer
     int Run(const CustomizationConfig &config);
 };
 
-} // namespace customizer
 } // namespace osrm
 
 #endif // OSRM_CUSTOMIZE_CUSTOMIZER_HPP

include/customizer/customizer_config.hpp

@@ -9,9 +9,7 @@
 #include "storage/io_config.hpp"
 #include "updater/updater_config.hpp"
 
-namespace osrm
+namespace osrm::customizer
-{
-namespace customizer
 {
 
 struct CustomizationConfig final : storage::IOConfig
@@ -39,7 +37,6 @@ struct CustomizationConfig final : storage::IOConfig
 
     updater::UpdaterConfig updater_config;
 };
-} // namespace customizer
 } // namespace osrm
 
 #endif // OSRM_CUSTOMIZE_CUSTOMIZER_CONFIG_HPP

include/customizer/edge_based_graph.hpp

@@ -11,9 +11,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-namespace osrm
+namespace osrm::customizer
-{
-namespace customizer
 {
 
 struct EdgeBasedGraphEdgeData
@@ -126,7 +124,6 @@ using MultiLevelEdgeBasedGraph =
     MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::Container>;
 using MultiLevelEdgeBasedGraphView =
     MultiLevelGraph<EdgeBasedGraphEdgeData, storage::Ownership::View>;
-} // namespace customizer
 } // namespace osrm
 
 #endif

include/customizer/files.hpp

@@ -9,11 +9,7 @@
 
 #include <unordered_map>
 
-namespace osrm
+namespace osrm::customizer::files
-{
-namespace customizer
-{
-namespace files
 {
 
 // reads .osrm.cell_metrics file
@@ -106,8 +102,6 @@ inline void writeGraph(const boost::filesystem::path &path,
     writer.WriteFrom("/mld/connectivity_checksum", connectivity_checksum);
     serialization::write(writer, "/mld/multilevelgraph", graph);
 }
-} // namespace files
-} // namespace customizer
 } // namespace osrm
 
 #endif

include/customizer/serialization.hpp

@@ -9,11 +9,7 @@
 #include "storage/shared_memory_ownership.hpp"
 #include "storage/tar.hpp"
 
-namespace osrm
+namespace osrm::customizer::serialization
-{
-namespace customizer
-{
-namespace serialization
 {
 
 template <storage::Ownership Ownership>
@@ -65,8 +61,6 @@ inline void write(storage::tar::FileWriter &writer,
     storage::serialization::write(writer, name + "/is_backward_edge", graph.is_backward_edge);
     storage::serialization::write(writer, name + "/node_to_edge_offset", graph.node_to_edge_offset);
 }
-} // namespace serialization
-} // namespace customizer
 } // namespace osrm
 
 #endif

include/engine/algorithm.hpp

@@ -3,11 +3,7 @@
 
 #include <type_traits>
 
-namespace osrm
+namespace osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace routing_algorithms
 {
 
 // Contraction Hiearchy
@@ -111,8 +107,6 @@ template <> struct HasGetTileTurns<mld::Algorithm> final : std::true_type
 template <> struct HasExcludeFlags<mld::Algorithm> final : std::true_type
 {
 };
-} // namespace routing_algorithms
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/base_api.hpp

@@ -18,11 +18,7 @@
 #include <memory>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 static const constexpr char *INTERSECTION_DELIMITER = " / ";
@@ -170,8 +166,6 @@ class BaseAPI
     const BaseParameters &parameters;
 };
 
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/base_parameters.hpp

@@ -38,11 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -124,8 +120,6 @@ struct BaseParameters
                            });
     }
 };
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif // ROUTE_PARAMETERS_HPP

include/engine/api/base_result.hpp

@@ -8,16 +8,10 @@
 
 #include "util/json_container.hpp"
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 using ResultT =
     mapbox::util::variant<util::json::Object, std::string, flatbuffers::FlatBufferBuilder>;
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/flatbuffers/fbresult_generated.h

@@ -6,10 +6,7 @@
 
 #include "flatbuffers/flatbuffers.h"
 
-namespace osrm {
+namespace osrm::engine::api::fbresult {
-namespace engine {
-namespace api {
-namespace fbresult {
 
 struct Position;
 
@@ -2431,9 +2428,6 @@ inline std::unique_ptr<osrm::engine::api::fbresult::FBResultT> UnPackSizePrefixe
   return std::unique_ptr<osrm::engine::api::fbresult::FBResultT>(GetSizePrefixedFBResult(buf)->UnPack(res));
 }
 
-}  // namespace fbresult
-}  // namespace api
-}  // namespace engine
 }  // namespace osrm
 
 #endif  // FLATBUFFERS_GENERATED_FBRESULT_OSRM_ENGINE_API_FBRESULT_H_

include/engine/api/json_factory.hpp

@@ -19,16 +19,12 @@
 #include <string>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 struct Hint;
 
-namespace api
+namespace api::json
-{
-namespace json
 {
 namespace detail
 {
@@ -112,9 +108,7 @@ util::json::Object makeRouteLeg(guidance::RouteLeg leg, util::json::Array steps)
 util::json::Array makeRouteLegs(std::vector<guidance::RouteLeg> legs,
                                 std::vector<util::json::Value> step_geometries,
                                 std::vector<util::json::Object> annotations);
-} // namespace json
 } // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif // ENGINE_GUIDANCE_API_RESPONSE_GENERATOR_HPP_

include/engine/api/match_api.hpp

@@ -12,11 +12,7 @@
 
 #include "util/integer_range.hpp"
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 class MatchAPI final : public RouteAPI
@@ -253,8 +249,6 @@ class MatchAPI final : public RouteAPI
     const tidy::Result &tidy_result;
 };
 
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/match_parameters.hpp

@@ -32,11 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -98,8 +94,6 @@ struct MatchParameters : public RouteParameters
                (timestamps.empty() || timestamps.size() == coordinates.size());
     }
 };
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/match_parameters_tidy.hpp

@@ -11,13 +11,7 @@
 #include <boost/assert.hpp>
 #include <boost/dynamic_bitset.hpp>
 
-namespace osrm
+namespace osrm::engine::api::tidy
-{
-namespace engine
-{
-namespace api
-{
-namespace tidy
 {
 
 struct Thresholds
@@ -200,9 +194,6 @@ inline Result tidy(const MatchParameters &params, Thresholds cfg = {15., 5})
     return result;
 }
 
-} // namespace tidy
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/nearest_api.hpp

@@ -12,11 +12,7 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 class NearestAPI final : public BaseAPI
@@ -164,8 +160,6 @@ class NearestAPI final : public BaseAPI
     }
 };
 
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/nearest_parameters.hpp

@@ -30,11 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "engine/api/base_parameters.hpp"
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -52,8 +48,6 @@ struct NearestParameters : public BaseParameters
 
     bool IsValid() const { return BaseParameters::IsValid() && number_of_results >= 1; }
 };
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif // ENGINE_API_NEAREST_PARAMETERS_HPP

include/engine/api/route_api.hpp

@@ -31,11 +31,7 @@
 #include <map>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 class RouteAPI : public BaseAPI
@@ -1001,8 +997,6 @@ class RouteAPI : public BaseAPI
     }
 };
 
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/route_parameters.hpp

@@ -32,11 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -211,8 +207,6 @@ inline RouteParameters::AnnotationsType operator|=(RouteParameters::AnnotationsT
 {
     return lhs = lhs | rhs;
 }
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/table_api.hpp

@@ -22,11 +22,7 @@
 
 #include <iterator>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 class TableAPI final : public BaseAPI
@@ -422,8 +418,6 @@ class TableAPI final : public BaseAPI
     const TableParameters &parameters;
 };
 
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/table_parameters.hpp

@@ -36,11 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iterator>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -166,8 +162,6 @@ inline TableParameters::AnnotationsType &operator|=(TableParameters::Annotations
 {
     return lhs = lhs | rhs;
 }
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif // ENGINE_API_TABLE_PARAMETERS_HPP

include/engine/api/tile_parameters.hpp

@@ -30,11 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cmath>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -70,8 +66,6 @@ struct TileParameters final
         return valid_x && valid_y && valid_z;
     }
 };
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/trip_api.hpp

@@ -10,11 +10,7 @@
 
 #include "util/integer_range.hpp"
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 class TripAPI final : public RouteAPI
@@ -180,8 +176,6 @@ class TripAPI final : public RouteAPI
     const TripParameters &parameters;
 };
 
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/api/trip_parameters.hpp

@@ -33,11 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/optional.hpp>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::api
-{
-namespace engine
-{
-namespace api
 {
 
 /**
@@ -76,8 +72,6 @@ struct TripParameters : public RouteParameters
 
     bool IsValid() const { return RouteParameters::IsValid(); }
 };
-} // namespace api
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/approach.hpp

@@ -30,9 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <cstdint>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 enum class Approach : std::uint8_t
@@ -41,6 +39,5 @@ enum class Approach : std::uint8_t
     UNRESTRICTED = 1
 
 };
-}
 } // namespace osrm
 #endif

include/engine/bearing.hpp

@@ -28,9 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_ENGINE_BEARING_HPP
 #define OSRM_ENGINE_BEARING_HPP
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 struct Bearing
@@ -46,7 +44,6 @@ inline bool operator==(const Bearing lhs, const Bearing rhs)
     return lhs.bearing == rhs.bearing && lhs.range == rhs.range;
 }
 inline bool operator!=(const Bearing lhs, const Bearing rhs) { return !(lhs == rhs); }
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/data_watchdog.hpp

@@ -17,9 +17,7 @@
 #include <memory>
 #include <thread>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 namespace detail
@@ -149,7 +147,6 @@ class DataWatchdogImpl<AlgorithmT, datafacade::ContiguousInternalMemoryDataFacad
 // once a new dataset arrives.
 template <typename AlgorithmT, template <typename A> class FacadeT>
 using DataWatchdog = detail::DataWatchdogImpl<AlgorithmT, FacadeT<AlgorithmT>>;
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/datafacade.hpp

@@ -3,15 +3,12 @@
 
 #include "engine/datafacade/contiguous_internalmem_datafacade.hpp"
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 using DataFacadeBase = datafacade::ContiguousInternalMemoryDataFacadeBase;
 template <typename AlgorithmT>
 using DataFacade = datafacade::ContiguousInternalMemoryDataFacade<AlgorithmT>;
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/datafacade/algorithm_datafacade.hpp

@@ -12,11 +12,7 @@
 #include "util/filtered_graph.hpp"
 #include "util/integer_range.hpp"
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 // Namespace local aliases for algorithms
@@ -109,8 +105,6 @@ template <> class AlgorithmDataFacade<MLD>
     virtual EdgeID FindEdge(const NodeID edge_based_node_from,
                             const NodeID edge_based_node_to) const = 0;
 };
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/datafacade/contiguous_block_allocator.hpp

@@ -3,11 +3,7 @@
 
 #include "storage/shared_data_index.hpp"
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 class ContiguousBlockAllocator
@@ -19,8 +15,6 @@ class ContiguousBlockAllocator
     virtual const storage::SharedDataIndex &GetIndex() = 0;
 };
 
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_DATAFACADE_CONTIGUOUS_BLOCK_ALLOCATOR_HPP_

include/engine/datafacade/contiguous_internalmem_datafacade.hpp

@@ -28,11 +28,7 @@
 #include <utility>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 template <typename AlgorithmT> class ContiguousInternalMemoryAlgorithmDataFacade;
@@ -693,8 +689,6 @@ class ContiguousInternalMemoryDataFacade<MLD> final
     {
     }
 };
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif // CONTIGUOUS_INTERNALMEM_DATAFACADE_HPP

include/engine/datafacade/datafacade_base.hpp

@@ -40,11 +40,7 @@
 #include <utility>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 class BaseDataFacade
@@ -189,8 +185,6 @@ class BaseDataFacade
     virtual std::vector<extractor::ManeuverOverride>
     GetOverridesThatStartAt(const NodeID edge_based_node_id) const = 0;
 };
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif // DATAFACADE_BASE_HPP

include/engine/datafacade/mmap_memory_allocator.hpp

@@ -12,11 +12,7 @@
 #include <memory>
 #include <string>
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 /**
@@ -37,8 +33,6 @@ class MMapMemoryAllocator final : public ContiguousBlockAllocator
     std::string rtree_filename;
 };
 
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_DATAFACADE_SHARED_MEMORY_ALLOCATOR_HPP_

include/engine/datafacade/process_memory_allocator.hpp

@@ -6,11 +6,7 @@
 
 #include <memory>
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 /**
@@ -34,8 +30,6 @@ class ProcessMemoryAllocator final : public ContiguousBlockAllocator
     std::unique_ptr<char[]> internal_memory;
 };
 
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_DATAFACADE_PROCESS_MEMORY_ALLOCATOR_HPP_

include/engine/datafacade/shared_memory_allocator.hpp

@@ -8,11 +8,7 @@
 
 #include <memory>
 
-namespace osrm
+namespace osrm::engine::datafacade
-{
-namespace engine
-{
-namespace datafacade
 {
 
 /**
@@ -35,8 +31,6 @@ class SharedMemoryAllocator final : public ContiguousBlockAllocator
     std::vector<std::unique_ptr<storage::SharedMemory>> memory_regions;
 };
 
-} // namespace datafacade
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_ENGINE_DATAFACADE_SHARED_MEMORY_ALLOCATOR_HPP_

include/engine/datafacade_factory.hpp

@@ -16,9 +16,7 @@
 #include <memory>
 #include <unordered_map>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 // This class selects the right facade for
 template <template <typename A> class FacadeT, typename AlgorithmT> class DataFacadeFactory
@@ -152,7 +150,6 @@ template <template <typename A> class FacadeT, typename AlgorithmT> class DataFa
     std::unordered_map<std::string, extractor::ClassData> name_to_class;
     const extractor::ProfileProperties *properties = nullptr;
 };
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/datafacade_provider.hpp

@@ -8,9 +8,7 @@
 #include "engine/datafacade/process_memory_allocator.hpp"
 #include "engine/datafacade_factory.hpp"
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 namespace detail
 {
@@ -103,7 +101,6 @@ template <typename AlgorithmT>
 using ImmutableProvider = detail::ImmutableProvider<AlgorithmT, DataFacade>;
 template <typename AlgorithmT>
 using ExternalProvider = detail::ExternalProvider<AlgorithmT, DataFacade>;
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/douglas_peucker.hpp

@@ -6,9 +6,7 @@
 #include <iterator>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 namespace detail
 {
@@ -75,7 +73,6 @@ inline std::vector<util::Coordinate> douglasPeucker(const std::vector<util::Coor
 {
     return douglasPeucker(begin(geometry), end(geometry), zoom_level);
 }
-} // namespace engine
 } // namespace osrm
 
 #endif /* DOUGLAS_PEUCKER_HPP_ */

include/engine/engine.hpp

@@ -23,9 +23,7 @@
 #include <memory>
 #include <string>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 class EngineInterface
@@ -130,7 +128,6 @@ template <typename Algorithm> class Engine final : public EngineInterface
     const plugins::MatchPlugin match_plugin;
     const plugins::TilePlugin tile_plugin;
 };
-} // namespace engine
 } // namespace osrm
 
 #endif // OSRM_IMPL_HPP

include/engine/engine_config.hpp

@@ -34,10 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string>
 
-namespace osrm
+namespace osrm::engine
-{
-
-namespace engine
 {
 
 /**
@@ -94,7 +91,6 @@ struct EngineConfig final
     std::string verbosity;
     std::string dataset_name;
 };
-} // namespace engine
 } // namespace osrm
 
 #endif // SERVER_CONFIG_HPP

include/engine/geospatial_query.hpp

@@ -18,9 +18,7 @@
 #include <memory>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 inline std::pair<bool, bool> operator&&(const std::pair<bool, bool> &a,
@@ -583,7 +581,6 @@ template <typename RTreeT, typename DataFacadeT> class GeospatialQuery
     const CoordinateList &coordinates;
     DataFacadeT &datafacade;
 };
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/guidance/assemble_geometry.hpp

@@ -16,11 +16,7 @@
 #include <utility>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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

include/engine/guidance/assemble_leg.hpp

@@ -23,11 +23,7 @@
 #include <utility>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_

include/engine/guidance/assemble_overview.hpp

@@ -7,18 +7,12 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace guidance
 {
 
 std::vector<util::Coordinate> assembleOverview(const std::vector<LegGeometry> &leg_geometries,
                                                const bool use_simplification);
 
-} // namespace guidance
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/guidance/assemble_route.hpp

@@ -6,17 +6,11 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace guidance
 {
 
 Route assembleRoute(const std::vector<RouteLeg> &route_legs);
 
-} // namespace guidance
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/guidance/assemble_steps.hpp

@@ -22,11 +22,7 @@
 #include <guidance/turn_bearing.hpp>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_

include/engine/guidance/collapse_scenario_detection.hpp

@@ -4,11 +4,7 @@
 #include "engine/guidance/collapsing_utility.hpp"
 #include "engine/guidance/route_step.hpp"
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_ */

include/engine/guidance/collapse_turns.hpp

@@ -6,11 +6,7 @@
 #include <type_traits>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_ */

include/engine/guidance/collapsing_utility.hpp

@@ -10,11 +10,7 @@
 #include <boost/range/algorithm_ext/erase.hpp>
 #include <cstddef>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_ */

include/engine/guidance/lane_processing.hpp

@@ -6,11 +6,7 @@
 #include "engine/guidance/route_step.hpp"
 #include "util/attributes.hpp"
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_ */

include/engine/guidance/leg_geometry.hpp

@@ -12,11 +12,7 @@
 #include <cstdlib>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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

include/engine/guidance/post_processing.hpp

@@ -9,11 +9,7 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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

include/engine/guidance/postprocessing_toolkit.hpp

@@ -7,11 +7,7 @@
 #include <iterator>
 #include <utility>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_ */

include/engine/guidance/route.hpp

@@ -1,11 +1,7 @@
 #ifndef ROUTE_HPP
 #define ROUTE_HPP
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace guidance
 {
 
 struct Route
@@ -14,8 +10,6 @@ struct Route
     double duration;
     double weight;
 };
-} // namespace guidance
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/guidance/route_leg.hpp

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

include/engine/guidance/route_step.hpp

@@ -16,11 +16,7 @@
 
 #include <boost/range/iterator_range.hpp>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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

include/engine/guidance/step_maneuver.hpp

@@ -8,11 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace guidance
 {
 
 enum class WaypointType : std::uint8_t
@@ -44,7 +40,5 @@ inline StepManeuver getInvalidStepManeuver()
             0};
 }
 
-} // namespace guidance
-} // namespace engine
 } // namespace osrm
 #endif

include/engine/guidance/verbosity_reduction.hpp

@@ -6,11 +6,7 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::guidance
-{
-namespace engine
-{
-namespace 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_ */

include/engine/hint.hpp

@@ -36,9 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <iosfwd>
 #include <string>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 // Fwd. decls.
@@ -83,7 +81,6 @@ constexpr std::size_t ENCODED_SEGMENT_HINT_SIZE = 112;
 static_assert(ENCODED_SEGMENT_HINT_SIZE / 4 * 3 >= sizeof(SegmentHint),
               "ENCODED_SEGMENT_HINT_SIZE does not match size of SegmentHint");
 
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/internal_route_result.hpp

@@ -18,9 +18,7 @@
 #include <boost/optional.hpp>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 struct PathData
@@ -152,7 +150,6 @@ inline InternalRouteResult CollapseInternalRouteResult(const InternalRouteResult
     BOOST_ASSERT(collapsed.leg_endpoints.size() == collapsed.unpacked_path_segments.size());
     return collapsed;
 }
-} // namespace engine
 } // namespace osrm
 
 #endif // RAW_ROUTE_DATA_H

include/engine/map_matching/bayes_classifier.hpp

@@ -8,11 +8,7 @@
 
 #include <boost/math/constants/constants.hpp>
 
-namespace osrm
+namespace osrm::engine::map_matching
-{
-namespace engine
-{
-namespace map_matching
 {
 
 struct NormalDistribution
@@ -98,8 +94,6 @@ class BayesClassifier
     double positive_apriori_probability;
     double negative_apriori_probability;
 };
-} // namespace map_matching
-} // namespace engine
 } // namespace osrm
 
 #endif // BAYES_CLASSIFIER_HPP

include/engine/map_matching/hidden_markov_model.hpp

@@ -11,11 +11,7 @@
 #include <limits>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::map_matching
-{
-namespace engine
-{
-namespace map_matching
 {
 
 static const double log_2_pi = std::log(2. * boost::math::constants::pi<double>());
@@ -137,8 +133,6 @@ template <class CandidateLists> struct HiddenMarkovModel
         return initial_timestamp;
     }
 };
-} // namespace map_matching
-} // namespace engine
 } // namespace osrm
 
 #endif // HIDDEN_MARKOV_MODEL

include/engine/map_matching/matching_confidence.hpp

@@ -5,11 +5,7 @@
 
 #include <cmath>
 
-namespace osrm
+namespace osrm::engine::map_matching
-{
-namespace engine
-{
-namespace map_matching
 {
 
 struct MatchingConfidence
@@ -51,8 +47,6 @@ struct MatchingConfidence
   private:
     ClassifierT classifier;
 };
-} // namespace map_matching
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/map_matching/sub_matching.hpp

@@ -5,11 +5,7 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::map_matching
-{
-namespace engine
-{
-namespace map_matching
 {
 
 struct SubMatching
@@ -19,8 +15,6 @@ struct SubMatching
     std::vector<unsigned> alternatives_count;
     double confidence;
 };
-} // namespace map_matching
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/phantom_node.hpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef OSRM_ENGINE_PHANTOM_NODES_H
+#ifndef OSRM_ENGINE_PHANTOM_NODE_H
-#define OSRM_ENGINE_PHANTOM_NODES_H
+#define OSRM_ENGINE_PHANTOM_NODE_H
 
 #include <vector>
 
@@ -38,9 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 struct PhantomNode
@@ -273,7 +271,6 @@ struct PhantomEndpoints
     PhantomNode target_phantom;
 };
 
-} // namespace engine
 } // namespace osrm
 
-#endif // PHANTOM_NODES_H
+#endif // OSRM_ENGINE_PHANTOM_NODE_H

include/engine/plugins/match.hpp

@@ -9,11 +9,7 @@
 
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class MatchPlugin : public BasePlugin
@@ -38,8 +34,6 @@ class MatchPlugin : public BasePlugin
     const int max_locations_map_matching;
     const double max_radius_map_matching;
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif // MATCH_HPP

include/engine/plugins/nearest.hpp

@@ -7,11 +7,7 @@
 #include "engine/routing_algorithms.hpp"
 #include "osrm/json_container.hpp"
 
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class NearestPlugin final : public BasePlugin
@@ -26,8 +22,6 @@ class NearestPlugin final : public BasePlugin
   private:
     const int max_results;
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif /* NEAREST_HPP */

include/engine/plugins/plugin_base.hpp

@@ -21,11 +21,7 @@
 
 #include <util/log.hpp>
 
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class BasePlugin
@@ -325,8 +321,6 @@ class BasePlugin
                std::to_string(missing_index);
     }
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif /* BASE_PLUGIN_HPP */

include/engine/plugins/table.hpp

@@ -8,11 +8,7 @@
 
 #include "util/json_container.hpp"
 
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class TablePlugin final : public BasePlugin
@@ -27,8 +23,6 @@ class TablePlugin final : public BasePlugin
   private:
     const int max_locations_distance_table;
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif // TABLE_HPP

include/engine/plugins/tile.hpp

@@ -16,11 +16,7 @@
  * OSRM is routing.  This is very useful for debugging routing
  * errors
  */
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class TilePlugin final : public BasePlugin
@@ -30,8 +26,6 @@ class TilePlugin final : public BasePlugin
                          const api::TileParameters &parameters,
                          osrm::engine::api::ResultT &pbf_buffer) const;
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif /* TILEPLUGIN_HPP */

include/engine/plugins/trip.hpp

@@ -18,11 +18,7 @@
 #include <utility>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class TripPlugin final : public BasePlugin
@@ -42,8 +38,6 @@ class TripPlugin final : public BasePlugin
                          const api::TripParameters &parameters,
                          osrm::engine::api::ResultT &json_result) const;
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif // TRIP_HPP

include/engine/plugins/viaroute.hpp

@@ -15,11 +15,7 @@
 #include <string>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine::plugins
-{
-namespace engine
-{
-namespace plugins
 {
 
 class ViaRoutePlugin final : public BasePlugin
@@ -35,8 +31,6 @@ class ViaRoutePlugin final : public BasePlugin
                          const api::RouteParameters &route_parameters,
                          osrm::engine::api::ResultT &json_result) const;
 };
-} // namespace plugins
-} // namespace engine
 } // namespace osrm
 
 #endif // VIA_ROUTE_HPP

include/engine/polyline_compressor.hpp

@@ -8,9 +8,7 @@
 #include <string>
 #include <vector>
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 namespace detail
 {
@@ -80,7 +78,6 @@ std::vector<util::Coordinate> decodePolyline(const std::string &polyline)
     }
     return coordinates;
 }
-} // namespace engine
 } // namespace osrm
 
 #endif /* POLYLINECOMPRESSOR_H_ */

include/engine/routing_algorithms.hpp

@@ -11,9 +11,7 @@
 #include "engine/routing_algorithms/shortest_path.hpp"
 #include "engine/routing_algorithms/tile_turns.hpp"
 
-namespace osrm
+namespace osrm::engine
-{
-namespace engine
 {
 
 class RoutingAlgorithmsInterface
@@ -232,7 +230,6 @@ inline std::vector<routing_algorithms::TurnData> RoutingAlgorithms<Algorithm>::G
     return routing_algorithms::getTileTurns(*facade, edges, sorted_edge_indexes);
 }
 
-} // namespace engine
 } // namespace osrm
 
 #endif

include/engine/routing_algorithms/alternative_path.hpp

@@ -9,11 +9,7 @@
 
 #include "util/exception.hpp"
 
-namespace osrm
+namespace osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace 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 osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace 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 osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace 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 osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace 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 osrm::engine::routing_algorithms
-{
-namespace engine
-{
-
-namespace 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 osrm::engine::routing_algorithms::ch
-{
-namespace engine
-{
-
-namespace routing_algorithms
-{
-
-namespace 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 osrm::engine::routing_algorithms::mld
-{
-namespace engine
-{
-namespace routing_algorithms
-{
-namespace 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 osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace 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 osrm::engine::routing_algorithms
-{
-namespace engine
-{
-namespace 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 */