diff options
Diffstat (limited to 'Rx/v2/examples/doxygen')
-rw-r--r-- | Rx/v2/examples/doxygen/main.cpp | 9 | ||||
-rw-r--r-- | Rx/v2/examples/doxygen/range.cpp | 7 | ||||
-rw-r--r-- | Rx/v2/examples/doxygen/zip.cpp | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/Rx/v2/examples/doxygen/main.cpp b/Rx/v2/examples/doxygen/main.cpp index 0c7c351..8a831f2 100644 --- a/Rx/v2/examples/doxygen/main.cpp +++ b/Rx/v2/examples/doxygen/main.cpp @@ -1,2 +1,11 @@ #define CATCH_CONFIG_MAIN #include "catch.hpp" + +#include <iostream> +#include <thread> +#include <string> +std::string get_pid() { + std::stringstream s; + s << std::this_thread::get_id(); + return s.str(); +} diff --git a/Rx/v2/examples/doxygen/range.cpp b/Rx/v2/examples/doxygen/range.cpp index 7b84d7f..69eecbd 100644 --- a/Rx/v2/examples/doxygen/range.cpp +++ b/Rx/v2/examples/doxygen/range.cpp @@ -13,12 +13,7 @@ SCENARIO("range sample"){ printf("//! [range sample]\n"); } -#include <iostream> -std::string get_pid() { - std::stringstream s; - s << std::this_thread::get_id(); - return s.str(); -} +std::string get_pid(); SCENARIO("threaded range sample"){ printf("//! [threaded range sample]\n"); diff --git a/Rx/v2/examples/doxygen/zip.cpp b/Rx/v2/examples/doxygen/zip.cpp index 9085110..c5cd07b 100644 --- a/Rx/v2/examples/doxygen/zip.cpp +++ b/Rx/v2/examples/doxygen/zip.cpp @@ -51,7 +51,7 @@ SCENARIO("Selector zip sample"){ auto o1 = rxcpp::observable<>::interval(std::chrono::milliseconds(1)); auto o2 = rxcpp::observable<>::interval(std::chrono::milliseconds(2)); auto o3 = rxcpp::observable<>::interval(std::chrono::milliseconds(3)); - auto values = o1.zip( + auto values = o1 | rxcpp::operators::zip( [](int v1, int v2, int v3) { return 100 * v1 + 10 * v2 + v3; }, |