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
Download Patch File Download Diff File Expand all files Collapse all files
include/engine/api/base_api.hpp
+1 -7
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
include/engine/api/base_parameters.hpp
+1 -7
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
include/engine/api/base_result.hpp
+1 -7
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
include/engine/api/flatbuffers/fbresult_generated.h
+1 -7
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_
include/engine/api/json_factory.hpp
+2 -8
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_
include/engine/api/match_api.hpp
+1 -7
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
include/engine/api/match_parameters.hpp
+1 -7
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
include/engine/api/match_parameters_tidy.hpp
+1 -10
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
include/engine/api/nearest_api.hpp
+1 -7
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
include/engine/api/nearest_parameters.hpp
+1 -7
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
include/engine/api/route_api.hpp
+1 -7
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
include/engine/api/route_parameters.hpp
+1 -7
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
include/engine/api/table_api.hpp
+1 -7
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
include/engine/api/table_parameters.hpp
+1 -7
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
include/engine/api/tile_parameters.hpp
+1 -7
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
include/engine/api/trip_api.hpp
+1 -7
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
include/engine/api/trip_parameters.hpp
+1 -7
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