refs #118 Более общий интерфейс функции

izvolov · Jun 27, 2020 · 329f1be · 329f1be
1 parent 5664363
commit 329f1be
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/benchmark/include/utility/io/generate.hpp b/benchmark/include/utility/io/generate.hpp
@@ -8,15 +8,16 @@
 #include <cstddef>
 #include <cstdint>
 #include <functional>
-#include <iostream>
+#include <ostream>
 #include <random>
 #include <vector>
 
 namespace utility
 {
-    void
+    std::ostream &
         generate
         (
+            std::ostream & stream,
             std::size_t range_count,
             std::size_t range_length,
             std::int64_t min,
@@ -51,8 +52,10 @@ namespace utility
                 }
             }
 
-            write(std::cout, range);
+            write(stream, range);
         }
+
+        return stream;
     }
 } // namespace utility
 

diff --git a/benchmark/src/range_generator.cpp b/benchmark/src/range_generator.cpp
@@ -51,7 +51,7 @@ int main (int argc, const char * argv[])
             bool sort = vm["sort"].as<bool>();
             bool descending = vm["descending"].as<bool>();
 
-            utility::generate(range_count, range_length, min, max, seed, sort, descending);
+            utility::generate(std::cout, range_count, range_length, min, max, seed, sort, descending);
         }
     }
     catch (std::exception &)