diff options
-rw-r--r-- | Rx/v2/examples/println/main.cpp | 4 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/rx-notification.hpp | 2 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/rx-observable.hpp | 2 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/rx-subscriber.hpp | 4 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/rx-util.hpp | 1 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/sources/rx-iterate.hpp | 4 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/sources/rx-never.hpp | 2 | ||||
-rw-r--r-- | Rx/v2/test/operators/buffer.cpp | 10 | ||||
-rw-r--r-- | Rx/v2/test/sources/scope.cpp | 4 | ||||
-rw-r--r-- | Rx/v2/test/subscriptions/subscription.cpp | 4 |
10 files changed, 19 insertions, 18 deletions
diff --git a/Rx/v2/examples/println/main.cpp b/Rx/v2/examples/println/main.cpp index b9cf842..e41a8c3 100644 --- a/Rx/v2/examples/println/main.cpp +++ b/Rx/v2/examples/println/main.cpp @@ -40,9 +40,9 @@ auto println(OStream& os) #endif #ifdef UNICODE -int wmain(int argc, wchar_t** argv) +int wmain() #else -int main(int argc, char** argv) +int main() #endif { auto get_names = [](){return rx::observable<>::from<std::string>( diff --git a/Rx/v2/src/rxcpp/rx-notification.hpp b/Rx/v2/src/rxcpp/rx-notification.hpp index 064851a..0ba09ea 100644 --- a/Rx/v2/src/rxcpp/rx-notification.hpp +++ b/Rx/v2/src/rxcpp/rx-notification.hpp @@ -100,7 +100,7 @@ auto equals(const T& lhs, const T& rhs, int) } template<class T> -bool equals(const T& lhs, const T& rhs, ...) { +bool equals(const T&, const T&, ...) { throw std::runtime_error("value does not support equality tests"); return false; } diff --git a/Rx/v2/src/rxcpp/rx-observable.hpp b/Rx/v2/src/rxcpp/rx-observable.hpp index 10836ff..6b1ba3e 100644 --- a/Rx/v2/src/rxcpp/rx-observable.hpp +++ b/Rx/v2/src/rxcpp/rx-observable.hpp @@ -450,7 +450,7 @@ public: /// into the expression. /// template<class ResultType, class Operator> - auto lift_if(Operator&& op) const + auto lift_if(Operator&&) const -> typename std::enable_if<!detail::is_lift_function_for<T, subscriber<ResultType>, Operator>::value, decltype(rxs::from<ResultType>())>::type { return rxs::from<ResultType>(); diff --git a/Rx/v2/src/rxcpp/rx-subscriber.hpp b/Rx/v2/src/rxcpp/rx-subscriber.hpp index 2e2661d..0092637 100644 --- a/Rx/v2/src/rxcpp/rx-subscriber.hpp +++ b/Rx/v2/src/rxcpp/rx-subscriber.hpp @@ -112,7 +112,7 @@ public: const subscriber<T, O>& o, typename std::enable_if< !std::is_same<O, observer<T>>::value && - std::is_same<Observer, observer<T>>::value, void**>::type select = nullptr) + std::is_same<Observer, observer<T>>::value, void**>::type = nullptr) : lifetime(o.lifetime) , destination(o.destination.as_dynamic()) , id(o.id) @@ -685,7 +685,7 @@ auto make_subscriber(const subscriber<OtherT, OtherObserver>& , const composite_ return subscriber<T, observer<T, I>>(trace_id::make_next_id_subscriber(), cs, o); } template<class T, class OtherT, class OtherObserver, class I> -auto make_subscriber(const subscriber<OtherT, OtherObserver>& scbr, trace_id id, const composite_subscription& cs, +auto make_subscriber(const subscriber<OtherT, OtherObserver>&, trace_id id, const composite_subscription& cs, const observer<T, I>& o) -> subscriber<T, observer<T, I>> { return subscriber<T, observer<T, I>>(std::move(id), cs, o); diff --git a/Rx/v2/src/rxcpp/rx-util.hpp b/Rx/v2/src/rxcpp/rx-util.hpp index b6de101..2a6dae0 100644 --- a/Rx/v2/src/rxcpp/rx-util.hpp +++ b/Rx/v2/src/rxcpp/rx-util.hpp @@ -316,6 +316,7 @@ struct print_function template<class... TN> void operator()(const TN&... tn) const { bool inserts[] = {(os << tn, true)...}; + inserts[0] = *(inserts); // silence warning delimit(); } diff --git a/Rx/v2/src/rxcpp/sources/rx-iterate.hpp b/Rx/v2/src/rxcpp/sources/rx-iterate.hpp index 19aa84e..c78d0a2 100644 --- a/Rx/v2/src/rxcpp/sources/rx-iterate.hpp +++ b/Rx/v2/src/rxcpp/sources/rx-iterate.hpp @@ -160,14 +160,14 @@ template<class Value0, class... ValueN> auto from(Value0 v0, ValueN... vn) -> typename std::enable_if<!is_coordination<Value0>::value, decltype(iterate(*(std::array<Value0, sizeof...(ValueN) + 1>*)nullptr, identity_immediate()))>::type { - std::array<Value0, sizeof...(ValueN) + 1> c = {v0, vn...}; + std::array<Value0, sizeof...(ValueN) + 1> c{{v0, vn...}}; return iterate(std::move(c), identity_immediate()); } template<class Coordination, class Value0, class... ValueN> auto from(Coordination cn, Value0 v0, ValueN... vn) -> typename std::enable_if<is_coordination<Coordination>::value, decltype(iterate(*(std::array<Value0, sizeof...(ValueN) + 1>*)nullptr, std::move(cn)))>::type { - std::array<Value0, sizeof...(ValueN) + 1> c = {v0, vn...}; + std::array<Value0, sizeof...(ValueN) + 1> c{{v0, vn...}}; return iterate(std::move(c), std::move(cn)); } diff --git a/Rx/v2/src/rxcpp/sources/rx-never.hpp b/Rx/v2/src/rxcpp/sources/rx-never.hpp index 22b6c24..bcb991e 100644 --- a/Rx/v2/src/rxcpp/sources/rx-never.hpp +++ b/Rx/v2/src/rxcpp/sources/rx-never.hpp @@ -17,7 +17,7 @@ template<class T> struct never : public source_base<T> { template<class Subscriber> - void on_subscribe(Subscriber o) const { + void on_subscribe(Subscriber) const { } }; diff --git a/Rx/v2/test/operators/buffer.cpp b/Rx/v2/test/operators/buffer.cpp index eb71572..c8ade17 100644 --- a/Rx/v2/test/operators/buffer.cpp +++ b/Rx/v2/test/operators/buffer.cpp @@ -490,7 +490,7 @@ SCENARIO("buffer with time on intervals", "[buffer_with_time][operators][long][h }); printf("\n"); }, - [](std::exception_ptr e){ + [](std::exception_ptr){ printf("on_error\n"); }, [](){ @@ -534,7 +534,7 @@ SCENARIO("buffer with time on intervals, implicit coordination", "[buffer_with_t }); printf("\n"); }, - [](std::exception_ptr e){ + [](std::exception_ptr){ printf("on_error\n"); }, [](){ @@ -579,7 +579,7 @@ SCENARIO("buffer with time on overlapping intervals", "[buffer_with_time][operat }); printf("\n"); }, - [](std::exception_ptr e){ + [](std::exception_ptr){ printf("on_error\n"); }, [](){ @@ -624,7 +624,7 @@ SCENARIO("buffer with time on overlapping intervals, implicit coordination", "[b }); printf("\n"); }, - [](std::exception_ptr e){ + [](std::exception_ptr){ printf("on_error\n"); }, [](){ @@ -672,7 +672,7 @@ SCENARIO("buffer with time on intervals, error", "[buffer_with_time][operators][ }); printf("\n"); }, - [](std::exception_ptr e){ + [](std::exception_ptr){ printf("on_error\n"); }, [](){ diff --git a/Rx/v2/test/sources/scope.cpp b/Rx/v2/test/sources/scope.cpp index ac3fc16..476d434 100644 --- a/Rx/v2/test/sources/scope.cpp +++ b/Rx/v2/test/sources/scope.cpp @@ -348,7 +348,7 @@ SCENARIO("scope, throw resource selector", "[scope][sources]"){ throw ex; //return resource(sc.clock()); }, - [&](resource r){ + [&](resource){ ++observable_factory_invoked; return rx::observable<>::never<int>(); } @@ -400,7 +400,7 @@ SCENARIO("scope, throw resource usage", "[scope][sources]"){ ++resource_factory_invoked; return resource(sc.clock()); }, - [&](resource r) -> rx::observable<int> { + [&](resource) -> rx::observable<int> { ++observable_factory_invoked; throw ex; } diff --git a/Rx/v2/test/subscriptions/subscription.cpp b/Rx/v2/test/subscriptions/subscription.cpp index 37c3683..ec4557f 100644 --- a/Rx/v2/test/subscriptions/subscription.cpp +++ b/Rx/v2/test/subscriptions/subscription.cpp @@ -124,7 +124,7 @@ SCENARIO("synchronized range debug", "[hide][subscribe][range][synchronize_debug ++std::get<1>(*completionstate); std::get<2>(*completionstate).on_next(n); }, - [=](std::exception_ptr e){ + [=](std::exception_ptr){ abort(); }, [=](){ @@ -233,7 +233,7 @@ SCENARIO("observe_on range debug", "[hide][subscribe][range][observe_on_debug][o ++std::get<1>(*completionstate); std::get<2>(*completionstate).on_next(n); }, - [=](std::exception_ptr e){ + [=](std::exception_ptr){ abort(); }, [=](){ |