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

Revert "Use explicitly sized std::array instead of C array and ptr arithmetic"

Browse Source 
This reverts commit 24321657ee.
This commit is contained in:
Dennis Luxen 2024-05-06 21:01:55 +02:00
parent 24321657ee
commit e4c017533c
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/guidance/turn_instruction.hpp
View File

@ -154,21 +154,24 @@ inline bool operator==(const TurnInstruction lhs, const TurnInstruction rhs)
inline bool hasRoundaboutType(const TurnInstruction instruction) inline bool hasRoundaboutType(const TurnInstruction instruction)
{ {
using namespace guidance::TurnType; using namespace guidance::TurnType;
const constexpr std::array<TurnType::Enum, 13> valid_types = {TurnType::EnterRoundabout, const constexpr TurnType::Enum valid_types[] = {TurnType::EnterRoundabout,
TurnType::EnterAndExitRoundabout, TurnType::EnterAndExitRoundabout,
TurnType::EnterRotary, TurnType::EnterRotary,
TurnType::EnterAndExitRotary, TurnType::EnterAndExitRotary,
TurnType::EnterRoundaboutIntersection, TurnType::EnterRoundaboutIntersection,
TurnType::EnterAndExitRoundaboutIntersection, TurnType::EnterAndExitRoundaboutIntersection,
TurnType::EnterRoundaboutAtExit, TurnType::EnterRoundaboutAtExit,
TurnType::ExitRoundabout, TurnType::ExitRoundabout,
TurnType::EnterRotaryAtExit, TurnType::EnterRotaryAtExit,
TurnType::ExitRotary, TurnType::ExitRotary,
TurnType::EnterRoundaboutIntersectionAtExit, TurnType::EnterRoundaboutIntersectionAtExit,
TurnType::ExitRoundaboutIntersection, TurnType::ExitRoundaboutIntersection,
TurnType::StayOnRoundabout}; TurnType::StayOnRoundabout};
return std::find(valid_types.cbegin(), valid_types.cend(), instruction.type); const auto *first = valid_types;
const auto *last = first + sizeof(valid_types) / sizeof(valid_types[0]);
return std::find(first, last, instruction.type) != last;
} }
inline bool entersRoundabout(const guidance::TurnInstruction instruction) inline bool entersRoundabout(const guidance::TurnInstruction instruction)