Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Use nested namespace

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.clang-tidy
View File

@ -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,

5
include/contractor/contract_excludable_graph.hpp
View File

@ -7,9 +7,7 @@
#include "contractor/graph_contractor_adaptors.hpp"
#include "contractor/query_graph.hpp"
namespace osrm
{
namespace contractor
namespace osrm::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

5
include/contractor/contracted_edge_container.hpp
View File

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

5
include/contractor/contracted_metric.hpp
View File

@ -3,9 +3,7 @@
#include "contractor/query_graph.hpp"
namespace osrm
{
namespace contractor
namespace osrm::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

5
include/contractor/contractor.hpp
View File

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

5
include/contractor/contractor_config.hpp
View File

@ -35,9 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string>
namespace osrm
{
namespace contractor
namespace osrm::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

5
include/contractor/contractor_graph.hpp
View File

@ -4,9 +4,7 @@
#include "util/dynamic_graph.hpp"
#include <algorithm>
namespace osrm
{
namespace contractor
namespace osrm::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_

5
include/contractor/contractor_heap.hpp
View File

@ -5,9 +5,7 @@
#include "util/typedefs.hpp"
#include "util/xor_fast_hash_storage.hpp"
namespace osrm
{
namespace contractor
namespace osrm::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_

5
include/contractor/contractor_search.hpp
View File

@ -8,9 +8,7 @@
#include <cstddef>
namespace osrm
{
namespace contractor
namespace osrm::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

5
include/contractor/crc32_processor.hpp
View File

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

8
include/contractor/files.hpp
View File

@ -5,11 +5,7 @@
#include <unordered_map>
namespace osrm
{
namespace contractor
{
namespace files
namespace osrm::contractor::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

5
include/contractor/graph_contractor.hpp
View File

@ -8,9 +8,7 @@
#include <tuple>
#include <vector>
namespace osrm
{
namespace contractor
namespace osrm::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

5
include/contractor/graph_contractor_adaptors.hpp
View File

@ -10,9 +10,7 @@
#include <vector>
namespace osrm
{
namespace contractor
namespace osrm::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_

5
include/contractor/query_edge.hpp
View File

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

5
include/contractor/query_graph.hpp
View File

@ -6,9 +6,7 @@
#include "util/static_graph.hpp"
#include "util/typedefs.hpp"
namespace osrm
{
namespace contractor
namespace osrm::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

8
include/contractor/serialization.hpp
View File

@ -8,11 +8,7 @@
#include "storage/serialization.hpp"
#include "storage/tar.hpp"
namespace osrm
{
namespace contractor
{
namespace serialization
namespace osrm::contractor::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

5
include/customizer/cell_customizer.hpp
View File

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

5
include/customizer/cell_metric.hpp
View File

@ -7,9 +7,7 @@
#include "util/typedefs.hpp"
#include "util/vector_view.hpp"
namespace osrm
{
namespace customizer
namespace osrm::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

5
include/customizer/customizer.hpp
View File

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

5
include/customizer/customizer_config.hpp
View File

@ -9,9 +9,7 @@
#include "storage/io_config.hpp"
#include "updater/updater_config.hpp"
namespace osrm
{
namespace customizer
namespace osrm::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

5
include/customizer/edge_based_graph.hpp
View File

@ -11,9 +11,7 @@
#include <boost/filesystem/path.hpp>
namespace osrm
{
namespace customizer
namespace osrm::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

8
include/customizer/files.hpp
View File

@ -9,11 +9,7 @@
#include <unordered_map>
namespace osrm
{
namespace customizer
{
namespace files
namespace osrm::customizer::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

8
include/customizer/serialization.hpp
View File

@ -9,11 +9,7 @@
#include "storage/shared_memory_ownership.hpp"
#include "storage/tar.hpp"
namespace osrm
{
namespace customizer
{
namespace serialization
namespace osrm::customizer::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

8
include/engine/algorithm.hpp
View File

@ -3,11 +3,7 @@
#include <type_traits>
namespace osrm
{
namespace engine
{
namespace routing_algorithms
namespace osrm::engine::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

8
include/engine/api/base_api.hpp
View File

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

8
include/engine/api/base_parameters.hpp
View File

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

8
include/engine/api/base_result.hpp
View File

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

8
include/engine/api/flatbuffers/fbresult_generated.h
View File

@ -6,10 +6,7 @@
#include "flatbuffers/flatbuffers.h"
namespace osrm {
namespace engine {
namespace api {
namespace fbresult {
namespace osrm::engine::api::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_

10
include/engine/api/json_factory.hpp
View File

@ -19,16 +19,12 @@
#include <string>
#include <vector>
namespace osrm
{
namespace engine
namespace osrm::engine
{
struct Hint;
namespace api
{
namespace json
namespace api::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_

8
include/engine/api/match_api.hpp
View File

@ -12,11 +12,7 @@
#include "util/integer_range.hpp"
namespace osrm
{
namespace engine
{
namespace api
namespace osrm::engine::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

8
include/engine/api/match_parameters.hpp
View File

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

11
include/engine/api/match_parameters_tidy.hpp
View File

@ -11,13 +11,7 @@
#include <boost/assert.hpp>
#include <boost/dynamic_bitset.hpp>
namespace osrm
{
namespace engine
{
namespace api
{
namespace tidy
namespace osrm::engine::api::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

8
include/engine/api/nearest_api.hpp
View File

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

8
include/engine/api/nearest_parameters.hpp
View File

@ -30,11 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "engine/api/base_parameters.hpp"
namespace osrm
{
namespace engine
{
namespace api
namespace osrm::engine::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

8
include/engine/api/route_api.hpp
View File

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

8
include/engine/api/route_parameters.hpp
View File

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

8
include/engine/api/table_api.hpp
View File

@ -22,11 +22,7 @@
#include <iterator>
namespace osrm
{
namespace engine
{
namespace api
namespace osrm::engine::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

8
include/engine/api/table_parameters.hpp
View File

@ -36,11 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <iterator>
#include <vector>
namespace osrm
{
namespace engine
{
namespace api
namespace osrm::engine::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

8
include/engine/api/tile_parameters.hpp
View File

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

8
include/engine/api/trip_api.hpp
View File

@ -10,11 +10,7 @@
#include "util/integer_range.hpp"
namespace osrm
{
namespace engine
{
namespace api
namespace osrm::engine::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

8
include/engine/api/trip_parameters.hpp
View File

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

5
include/engine/approach.hpp
View File

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

5
include/engine/bearing.hpp
View File

@ -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 engine
namespace osrm::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

5
include/engine/data_watchdog.hpp
View File

@ -17,9 +17,7 @@
#include <memory>
#include <thread>
namespace osrm
{
namespace engine
namespace osrm::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

5
include/engine/datafacade.hpp
View File

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

8
include/engine/datafacade/algorithm_datafacade.hpp
View File

@ -12,11 +12,7 @@
#include "util/filtered_graph.hpp"
#include "util/integer_range.hpp"
namespace osrm
{
namespace engine
{
namespace datafacade
namespace osrm::engine::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

8
include/engine/datafacade/contiguous_block_allocator.hpp
View File

@ -3,11 +3,7 @@
#include "storage/shared_data_index.hpp"
namespace osrm
{
namespace engine
{
namespace datafacade
namespace osrm::engine::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_

8
include/engine/datafacade/contiguous_internalmem_datafacade.hpp
View File

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

8
include/engine/datafacade/datafacade_base.hpp
View File

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

8
include/engine/datafacade/mmap_memory_allocator.hpp
View File

@ -12,11 +12,7 @@
#include <memory>
#include <string>
namespace osrm
{
namespace engine
{
namespace datafacade
namespace osrm::engine::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_

8
include/engine/datafacade/process_memory_allocator.hpp
View File

@ -6,11 +6,7 @@
#include <memory>
namespace osrm
{
namespace engine
{
namespace datafacade
namespace osrm::engine::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_

8
include/engine/datafacade/shared_memory_allocator.hpp
View File

@ -8,11 +8,7 @@
#include <memory>
namespace osrm
{
namespace engine
{
namespace datafacade
namespace osrm::engine::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_

5
include/engine/datafacade_factory.hpp
View File

@ -16,9 +16,7 @@
#include <memory>
#include <unordered_map>
namespace osrm
{
namespace engine
namespace osrm::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

5
include/engine/datafacade_provider.hpp
View File

@ -8,9 +8,7 @@
#include "engine/datafacade/process_memory_allocator.hpp"
#include "engine/datafacade_factory.hpp"
namespace osrm
{
namespace engine
namespace osrm::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

5
include/engine/douglas_peucker.hpp
View File

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

5
include/engine/engine.hpp
View File

@ -23,9 +23,7 @@
#include <memory>
#include <string>
namespace osrm
{
namespace engine
namespace osrm::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

6
include/engine/engine_config.hpp
View File

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

5
include/engine/geospatial_query.hpp
View File

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

8
include/engine/guidance/assemble_geometry.hpp
View File

@ -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

8
include/engine/guidance/assemble_leg.hpp
View File

@ -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_

8
include/engine/guidance/assemble_overview.hpp
View File

@ -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

8
include/engine/guidance/assemble_route.hpp
View File

@ -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

8
include/engine/guidance/assemble_steps.hpp
View File

@ -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_

8
include/engine/guidance/collapse_scenario_detection.hpp
View File

@ -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_ */

8
include/engine/guidance/collapse_turns.hpp
View File

@ -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_ */

8
include/engine/guidance/collapsing_utility.hpp
View File

@ -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_ */

8
include/engine/guidance/lane_processing.hpp
View File

@ -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_ */

8
include/engine/guidance/leg_geometry.hpp
View File

@ -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

8
include/engine/guidance/post_processing.hpp
View File

@ -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

8
include/engine/guidance/postprocessing_toolkit.hpp
View File

@ -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_ */

8
include/engine/guidance/route.hpp
View File

@ -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
include/engine/guidance/route_leg.hpp
View File

@ -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

8
include/engine/guidance/route_step.hpp
View File

@ -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
include/engine/guidance/step_maneuver.hpp
View File

@ -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

8
include/engine/guidance/verbosity_reduction.hpp
View File

@ -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_ */

5
include/engine/hint.hpp
View File

@ -36,9 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <iosfwd>
#include <string>
namespace osrm
{
namespace engine
namespace osrm::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

5
include/engine/internal_route_result.hpp
View File

@ -18,9 +18,7 @@
#include <boost/optional.hpp>
#include <vector>
namespace osrm
{
namespace engine
namespace osrm::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

8
include/engine/map_matching/bayes_classifier.hpp
View File

@ -8,11 +8,7 @@
#include <boost/math/constants/constants.hpp>
namespace osrm
{
namespace engine
{
namespace map_matching
namespace osrm::engine::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

8
include/engine/map_matching/hidden_markov_model.hpp
View File

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

8
include/engine/map_matching/matching_confidence.hpp
View File

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

8
include/engine/map_matching/sub_matching.hpp
View File

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

11
include/engine/phantom_node.hpp
View File

@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef OSRM_ENGINE_PHANTOM_NODES_H
#define OSRM_ENGINE_PHANTOM_NODES_H
#ifndef OSRM_ENGINE_PHANTOM_NODE_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 engine
namespace osrm::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

8
include/engine/plugins/match.hpp
View File

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

8
include/engine/plugins/nearest.hpp
View File

@ -7,11 +7,7 @@
#include "engine/routing_algorithms.hpp"
#include "osrm/json_container.hpp"
namespace osrm
{
namespace engine
{
namespace plugins
namespace osrm::engine::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 */

8
include/engine/plugins/plugin_base.hpp
View File

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

8
include/engine/plugins/table.hpp
View File

@ -8,11 +8,7 @@
#include "util/json_container.hpp"
namespace osrm
{
namespace engine
{
namespace plugins
namespace osrm::engine::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

8
include/engine/plugins/tile.hpp
View File

@ -16,11 +16,7 @@
* OSRM is routing. This is very useful for debugging routing
* errors
*/
namespace osrm
{
namespace engine
{
namespace plugins
namespace osrm::engine::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 */

8
include/engine/plugins/trip.hpp
View File

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

8
include/engine/plugins/viaroute.hpp
View File

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

5
include/engine/polyline_compressor.hpp
View File

@ -8,9 +8,7 @@
#include <string>
#include <vector>
namespace osrm
{
namespace engine
namespace osrm::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_ */

5
include/engine/routing_algorithms.hpp
View File

@ -11,9 +11,7 @@
#include "engine/routing_algorithms/shortest_path.hpp"
#include "engine/routing_algorithms/tile_turns.hpp"
namespace osrm
{
namespace engine
namespace osrm::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

8
include/engine/routing_algorithms/alternative_path.hpp
View File

@ -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

8
include/engine/routing_algorithms/direct_shortest_path.hpp
View File

@ -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 */

8
include/engine/routing_algorithms/many_to_many.hpp
View File

@ -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

8
include/engine/routing_algorithms/map_matching.hpp
View File

@ -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 */

9
include/engine/routing_algorithms/routing_base.hpp
View File

@ -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

13
include/engine/routing_algorithms/routing_base_ch.hpp
View File

@ -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

11
include/engine/routing_algorithms/routing_base_mld.hpp
View File

@ -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

8
include/engine/routing_algorithms/shortest_path.hpp
View File

@ -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 */

8
include/engine/routing_algorithms/shortest_path_impl.hpp
View File

@ -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 */

Some files were not shown because too many files have changed in this diff Show More