diff options
| author | Grigoriy Chudnov <g.chudnov@gmail.com> | 2017-01-03 00:40:00 +0300 |
|---|---|---|
| committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2017-01-02 13:40:00 -0800 |
| commit | 8baebf74d8fd65fcfc71d99da8ae2f342dfd565e (patch) | |
| tree | 64d6b2d8593317aba73756614cc219c9aeffbec8 /Rx/v2/test | |
| parent | 224c011cd294f0bbdcc56db766715c63f479991b (diff) | |
| download | RxCpp-8baebf74d8fd65fcfc71d99da8ae2f342dfd565e.tar.gz | |
decouple window_with_time_or_count from observable (#314)
* decouple window_with_time_or_count from observable
* struct rename
Diffstat (limited to 'Rx/v2/test')
| -rw-r--r-- | Rx/v2/test/operators/window.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Rx/v2/test/operators/window.cpp b/Rx/v2/test/operators/window.cpp index 1e9303e..5d668ff 100644 --- a/Rx/v2/test/operators/window.cpp +++ b/Rx/v2/test/operators/window.cpp @@ -3,6 +3,7 @@ #include <rxcpp/operators/rx-map.hpp> #include <rxcpp/operators/rx-window.hpp> #include <rxcpp/operators/rx-window_time.hpp> +#include <rxcpp/operators/rx-window_time_count.hpp> SCENARIO("window count, basic", "[window][operators]"){ GIVEN("1 hot observable of ints."){ @@ -771,10 +772,10 @@ SCENARIO("window with time or count, basic", "[window_with_time_or_count][operat auto res = w.start( [&]() { return xs - .window_with_time_or_count(milliseconds(70), 3, so) - .merge() + | rxo::window_with_time_or_count(milliseconds(70), 3, so) + | rxo::merge() // forget type to workaround lambda deduction bug on msvc 2013 - .as_dynamic(); + | rxo::as_dynamic(); } ); |