From b152d5d44f3087e29fc371db4ce820a4cf4ed7a6 Mon Sep 17 00:00:00 2001
From: Maxim Pimenov <m@maps.me>
Date: Fri, 1 Dec 2017 16:44:10 +0300
Subject: [PATCH] Review fixes.

---
 base/base_tests/control_flow_tests.cpp             | 2 +-
 base/control_flow.hpp                              | 5 ++++-
 coding/coding_tests/multilang_utf8_string_test.cpp | 6 ++++++
 coding/multilang_utf8_string.hpp                   | 7 +++++--
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/base/base_tests/control_flow_tests.cpp b/base/base_tests/control_flow_tests.cpp
index ba50886996..bbe6abd222 100644
--- a/base/base_tests/control_flow_tests.cpp
+++ b/base/base_tests/control_flow_tests.cpp
@@ -20,7 +20,7 @@ struct Repeater
     {
       ++m_calls;
       if (wrapper() == ControlFlow::Break)
-        break;
+        return;
     }
   }
 
diff --git a/base/control_flow.hpp b/base/control_flow.hpp
index 7695a95a51..98e140a974 100644
--- a/base/control_flow.hpp
+++ b/base/control_flow.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <type_traits>
 #include <utility>
 
 namespace base
@@ -15,8 +16,9 @@ enum class ControlFlow
 // To avoid excessive calls, |fn| may signal the end of execution via its return value,
 // which should then be checked by the wrapper's user.
 template <typename Fn>
-struct ControlFlowWrapper
+class ControlFlowWrapper
 {
+public:
   template <typename Gn>
   explicit ControlFlowWrapper(Gn && gn) : m_fn(std::forward<Gn>(gn))
   {
@@ -40,6 +42,7 @@ struct ControlFlowWrapper
     return ControlFlow::Continue;
   }
 
+private:
   Fn m_fn;
 };
 }  // namespace base
diff --git a/coding/coding_tests/multilang_utf8_string_test.cpp b/coding/coding_tests/multilang_utf8_string_test.cpp
index 874785c4d0..d9c89ee1db 100644
--- a/coding/coding_tests/multilang_utf8_string_test.cpp
+++ b/coding/coding_tests/multilang_utf8_string_test.cpp
@@ -6,6 +6,12 @@
 
 #include "3party/utfcpp/source/utf8.h"
 
+#include <cstddef>
+#include <string>
+#include <vector>
+
+using namespace std;
+
 namespace
 {
 struct lang_string
diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index f30f29cda2..f336dd0f84 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -8,8 +8,10 @@
 #include "base/control_flow.hpp"
 
 #include <array>
+#include <cstddef>
+#include <cstdint>
 #include <string>
-#include <type_traits>
+#include <utility>
 
 namespace utils
 {
@@ -88,6 +90,7 @@ public:
       AddString(l, utf8s);
   }
 
+  // Calls |fn| for each pair of |lang| and |utf8s| stored in this multilang string.
   template <typename Fn>
   void ForEach(Fn && fn) const
   {
@@ -98,7 +101,7 @@ public:
     {
       size_t const next = GetNextIndex(i);
       if (wrapper((m_s[i] & 0x3F), m_s.substr(i + 1, next - i - 1)) == base::ControlFlow::Break)
-        break;
+        return;
       i = next;
     }
   }