diff options
author | Igor Murashkin <iam@google.com> | 2018-08-10 17:28:34 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-10 17:28:34 -0700 |
commit | 1ef7e7e5215a5d995f8604ffd0c07ec797dc91bd (patch) | |
tree | d560d26fe573af8e19b12bbbdfeb3daad9388458 | |
parent | 7227f0fb330c32ead16df49853d47bf1942346c5 (diff) | |
parent | 5080b3e615f2c3fd3d9b5f7fb2ab5d6e5bb89d9c (diff) | |
download | RxCpp-1ef7e7e5215a5d995f8604ffd0c07ec797dc91bd.tar.gz |
Minor compilation/test fixes for compiling on android am: 6a3b2e5128
am: 5080b3e615
Change-Id: I882c37f9b174d5803e7ffdb32ed40dc0fa9ac775
-rw-r--r-- | Rx/v2/src/rxcpp/rx-notification.hpp | 4 | ||||
-rw-r--r-- | Rx/v2/test/operators/group_by.cpp | 1 | ||||
-rw-r--r-- | Rx/v2/test/operators/merge_delay_error.cpp | 6 | ||||
-rw-r--r-- | Rx/v2/test/operators/subscribe_on.cpp | 2 | ||||
-rw-r--r-- | Rx/v2/test/subscriptions/subscription.cpp | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/Rx/v2/src/rxcpp/rx-notification.hpp b/Rx/v2/src/rxcpp/rx-notification.hpp index c071e67..d624d34 100644 --- a/Rx/v2/src/rxcpp/rx-notification.hpp +++ b/Rx/v2/src/rxcpp/rx-notification.hpp @@ -280,8 +280,6 @@ std::ostream& operator<< (std::ostream& out, const recorded<T>& r) { } namespace rxn=notifications; -} - inline std::ostream& operator<< (std::ostream& out, const std::vector<rxcpp::notifications::subscription>& vs) { return rxcpp::notifications::detail::ostreamvector(out, vs); } @@ -290,4 +288,6 @@ inline std::ostream& operator<< (std::ostream& out, const std::vector<rxcpp::not return rxcpp::notifications::detail::ostreamvector(out, vr); } +} + #endif diff --git a/Rx/v2/test/operators/group_by.cpp b/Rx/v2/test/operators/group_by.cpp index 2c7c177..b575cd9 100644 --- a/Rx/v2/test/operators/group_by.cpp +++ b/Rx/v2/test/operators/group_by.cpp @@ -9,6 +9,7 @@ #include <rxcpp/operators/rx-observe_on.hpp> #include <locale> +#include <sstream> SCENARIO("range partitioned by group_by across hardware threads to derive pi", "[hide][pi][group_by][observe_on][long][perf]"){ GIVEN("a for loop"){ diff --git a/Rx/v2/test/operators/merge_delay_error.cpp b/Rx/v2/test/operators/merge_delay_error.cpp index d560b45..7c7a58d 100644 --- a/Rx/v2/test/operators/merge_delay_error.cpp +++ b/Rx/v2/test/operators/merge_delay_error.cpp @@ -7,7 +7,7 @@ const int static_onnextcalls = 1000000; //merge_delay_error must work the very same way as `merge()` except the error handling -SCENARIO("merge completes", "[merge][join][operators]"){ +SCENARIO("merge delay error completes", "[merge][join][operators]"){ GIVEN("1 hot observable with 3 cold observables of ints."){ auto sc = rxsc::make_test(); auto w = sc.create_worker(); @@ -117,7 +117,7 @@ SCENARIO("merge completes", "[merge][join][operators]"){ } } -SCENARIO("variadic merge completes with error", "[merge][join][operators]"){ +SCENARIO("variadic merge delay error completes with error", "[merge][join][operators]"){ GIVEN("1 hot observable with 3 cold observables of ints."){ auto sc = rxsc::make_test(); auto w = sc.create_worker(); @@ -211,7 +211,7 @@ SCENARIO("variadic merge completes with error", "[merge][join][operators]"){ } } -SCENARIO("variadic merge completes with 2 errors", "[merge][join][operators]"){ +SCENARIO("variadic merge delay error completes with 2 errors", "[merge][join][operators]"){ GIVEN("1 hot observable with 3 cold observables of ints."){ auto sc = rxsc::make_test(); auto w = sc.create_worker(); diff --git a/Rx/v2/test/operators/subscribe_on.cpp b/Rx/v2/test/operators/subscribe_on.cpp index baa66e2..936fbc1 100644 --- a/Rx/v2/test/operators/subscribe_on.cpp +++ b/Rx/v2/test/operators/subscribe_on.cpp @@ -4,6 +4,8 @@ #include <rxcpp/operators/rx-subscribe_on.hpp> #include <rxcpp/operators/rx-observe_on.hpp> +#include <sstream> + static const int static_subscriptions = 50000; SCENARIO("for loop subscribes to map with subscribe_on and observe_on", "[hide][for][just][subscribe][subscribe_on][observe_on][long][perf]"){ diff --git a/Rx/v2/test/subscriptions/subscription.cpp b/Rx/v2/test/subscriptions/subscription.cpp index 2a9f15d..635f3c1 100644 --- a/Rx/v2/test/subscriptions/subscription.cpp +++ b/Rx/v2/test/subscriptions/subscription.cpp @@ -6,6 +6,8 @@ #include "rxcpp/operators/rx-publish.hpp" #include "rxcpp/operators/rx-ref_count.hpp" +#include <sstream> + SCENARIO("observe subscription", "[hide]"){ GIVEN("observable of ints"){ WHEN("subscribe"){ |