From 837ab105ad500f3edc8ec1c707fb6e282a1d2e15 Mon Sep 17 00:00:00 2001 From: Moritz Kobitzsch Date: Tue, 8 Nov 2016 09:40:04 +0100 Subject: [PATCH] fix error in ordering arguments for requiresNameAnnounced versions --- include/util/debug.hpp | 2 +- include/util/guidance/toolkit.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/util/debug.hpp b/include/util/debug.hpp index a3f706985..44b9b02db 100644 --- a/include/util/debug.hpp +++ b/include/util/debug.hpp @@ -43,7 +43,7 @@ inline void print(const engine::guidance::RouteStep &step) std::cout << " " << (entry ? "true" : "false"); std::cout << ")"; } - std::cout << "] name[" << step.name_id << "]: " << step.name; + std::cout << "] name[" << step.name_id << "]: " << step.name << " Ref: " << step.ref << " Pronunciation: " << step.pronunciation; } inline void print(const std::vector &steps) diff --git a/include/util/guidance/toolkit.hpp b/include/util/guidance/toolkit.hpp index 44303f099..e9693b878 100644 --- a/include/util/guidance/toolkit.hpp +++ b/include/util/guidance/toolkit.hpp @@ -258,8 +258,8 @@ inline bool requiresNameAnnounced(const std::string &from_name, const std::string &from_ref, const std::string &from_pronunciation, const std::string &to_name, - const std::string &to_pronunciation, - const std::string &to_ref) + const std::string &to_ref, + const std::string &to_pronunciation) { // Dummy since we need to provide a SuffixTable but do not have the data for it. // (Guidance Post-Processing does not keep the suffix table around at the moment)