From ba6495c96addbc8279d580e261acce6b589a6eeb Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Mon, 30 Apr 2018 18:24:43 +0200 Subject: [PATCH] wb: more robust side_actions_container::get_turn the assumption (turn_beginnings_[num] == it) => (get_turn(it) == num) might be wrong in case that we have a turn with no actions, in which case turn_beginnings_ contains duplicates and we actually want the upper bound of (x <= it) in turn_beginnings_ --- src/whiteboard/side_actions.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/whiteboard/side_actions.cpp b/src/whiteboard/side_actions.cpp index 3020d7697b54..1632f2bd454d 100644 --- a/src/whiteboard/side_actions.cpp +++ b/src/whiteboard/side_actions.cpp @@ -83,10 +83,8 @@ std::size_t side_actions_container::get_turn_impl(std::size_t begin, std::size_t std::size_t mid = (begin+end) / 2; if(it < turn_beginnings_[mid]) { return get_turn_impl(begin, mid, it); - } else if(it > turn_beginnings_[mid]) { - return get_turn_impl(mid, end, it); } else { - return mid; + return get_turn_impl(mid, end, it); } }