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

Try to get rid of std::variant in json_container.hpp

Browse Source
This commit is contained in:
Siarhei Fedartsou 2024-09-29 09:12:35 +02:00
parent feb8da25cd
commit 07746de667
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util/json_container.hpp
View File

@ -141,6 +141,10 @@ struct Value
Value(const True &) noexcept : type(Type::True) {} Value(const True &) noexcept : type(Type::True) {}
Value(const False &) noexcept : type(Type::False) {} Value(const False &) noexcept : type(Type::False) {}
Value(String &&string_) noexcept : string(std::move(string_)), type(Type::String) {} Value(String &&string_) noexcept : string(std::move(string_)), type(Type::String) {}
Value(Number &&number_) noexcept : number(number_), type(Type::Number) {}
Value(Object &&object_) noexcept : object(std::move(object_)), type(Type::Object) {}
Value(Array &&array_) noexcept : array(std::move(array_)), type(Type::Array) {}
Value(const String &string_) noexcept : string(string_), type(Type::String) {}
Value(const Number &number_) noexcept : number(number_), type(Type::Number) {} Value(const Number &number_) noexcept : number(number_), type(Type::Number) {}
Value(const Object &object_) noexcept : object(object_), type(Type::Object) {} Value(const Object &object_) noexcept : object(object_), type(Type::Object) {}
Value(const Array &array_) noexcept : array(array_), type(Type::Array) {} Value(const Array &array_) noexcept : array(array_), type(Type::Array) {}

4
src/engine/api/json_factory.cpp
View File

@ -143,8 +143,8 @@ util::json::Object makeIntersection(const guidance::IntermediateIntersection &in
}); });
result.values.emplace("location", detail::coordinateToLonLat(intersection.location)); result.values.emplace("location", detail::coordinateToLonLat(intersection.location));
result.values.emplace("bearings", bearings); result.values.emplace("bearings", std::move(bearings));
result.values.emplace("entry", entry); result.values.emplace("entry", std::move(entry));
if (intersection.in != guidance::IntermediateIntersection::NO_INDEX) if (intersection.in != guidance::IntermediateIntersection::NO_INDEX)
result.values.emplace("in", intersection.in); result.values.emplace("in", intersection.in);
if (intersection.out != guidance::IntermediateIntersection::NO_INDEX) if (intersection.out != guidance::IntermediateIntersection::NO_INDEX)