[base] ControlFlow.

The convention we used to break a ForEach loop prematurely
was to return false from the function object that was being
called by ForEach. Now the function object must return a special
enum, thus making the intention more readable.

1 files changed, 4 insertions, 3 deletions

diff --git a/feature_list/feature_list.cpp b/feature_list/feature_list.cpp
index 4f3371f27b..e83aed49f8 100644
--- a/feature_list/feature_list.cpp
+++ b/feature_list/feature_list.cpp
@@ -25,6 +25,8 @@
 #include "storage/index.hpp"
 #include "storage/storage.hpp"
 
+#include "base/control_flow.hpp"
+
 #include "std/algorithm.hpp"
 #include "std/iostream.hpp"
 
@@ -120,10 +122,9 @@ string BuildUniqueId(ms::LatLon const & coords, string const & name)
 void AppendNames(FeatureType const & f, vector<string> & columns)
 {
   vector<string> names(kLangCount);
-  f.GetNames().ForEach([&names](int8_t code, string const & name) -> bool
-  {
+  f.GetNames().ForEach([&names](int8_t code, string const & name) -> base::ControlFlow {
     names[code] = string(name);
-    return true;
+    return base::ControlFlow::Continue;
   });
   columns.insert(columns.end(), next(names.begin()), names.end());
 }