diff options
| author | Grigoriy Chudnov <g.chudnov@gmail.com> | 2017-01-05 17:49:29 +0300 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2017-01-05 15:50:41 -0800 |
| commit | e23cac33d517662998f0542b263e27529e055c81 (patch) | |
| tree | 269a320df3f6a0a38145071bd4038bc6e5ba1429 /Rx/v2/test | |
| parent | 4b22ef4d55a93071be7313440ef6cb75455daa08 (diff) | |
| download | RxCpp-e23cac33d517662998f0542b263e27529e055c81.tar.gz | |
decouple merge from observable
Diffstat (limited to 'Rx/v2/test')
| -rw-r--r-- | Rx/v2/test/operators/group_by.cpp | 1 | ||||
| -rw-r--r-- | Rx/v2/test/operators/merge.cpp | 5 | ||||
| -rw-r--r-- | Rx/v2/test/operators/window.cpp | 1 | ||||
| -rw-r--r-- | Rx/v2/test/operators/window_toggle.cpp | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/Rx/v2/test/operators/group_by.cpp b/Rx/v2/test/operators/group_by.cpp index 44cae59..871db05 100644 --- a/Rx/v2/test/operators/group_by.cpp +++ b/Rx/v2/test/operators/group_by.cpp @@ -2,6 +2,7 @@ #include <rxcpp/operators/rx-group_by.hpp> #include <rxcpp/operators/rx-reduce.hpp> #include <rxcpp/operators/rx-map.hpp> +#include <rxcpp/operators/rx-merge.hpp> #include <rxcpp/operators/rx-take.hpp> #include <locale> diff --git a/Rx/v2/test/operators/merge.cpp b/Rx/v2/test/operators/merge.cpp index 3a03266..60e51a2 100644 --- a/Rx/v2/test/operators/merge.cpp +++ b/Rx/v2/test/operators/merge.cpp @@ -1,5 +1,6 @@ #include "../test.h" #include <rxcpp/operators/rx-reduce.hpp> +#include <rxcpp/operators/rx-merge.hpp> const int static_onnextcalls = 1000000; @@ -134,9 +135,9 @@ SCENARIO("merge completes", "[merge][join][operators]"){ auto res = w.start( [&]() { return xs - .merge() + | rxo::merge() // forget type to workaround lambda deduction bug on msvc 2013 - .as_dynamic(); + | rxo::as_dynamic(); } ); diff --git a/Rx/v2/test/operators/window.cpp b/Rx/v2/test/operators/window.cpp index 5d668ff..22d7997 100644 --- a/Rx/v2/test/operators/window.cpp +++ b/Rx/v2/test/operators/window.cpp @@ -1,6 +1,7 @@ #include "../test.h" #include <rxcpp/operators/rx-reduce.hpp> #include <rxcpp/operators/rx-map.hpp> +#include <rxcpp/operators/rx-merge.hpp> #include <rxcpp/operators/rx-window.hpp> #include <rxcpp/operators/rx-window_time.hpp> #include <rxcpp/operators/rx-window_time_count.hpp> diff --git a/Rx/v2/test/operators/window_toggle.cpp b/Rx/v2/test/operators/window_toggle.cpp index 08dc210..e157705 100644 --- a/Rx/v2/test/operators/window_toggle.cpp +++ b/Rx/v2/test/operators/window_toggle.cpp @@ -1,5 +1,6 @@ #include "../test.h" #include <rxcpp/operators/rx-map.hpp> +#include <rxcpp/operators/rx-merge.hpp> SCENARIO("window toggle, basic", "[window_toggle][operators]"){ GIVEN("1 hot observable of ints and hot observable of opens."){ |