diff options
author | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-04-28 10:56:15 -0700 |
---|---|---|
committer | Kirk Shoop <kirk.shoop@microsoft.com> | 2014-04-28 10:56:15 -0700 |
commit | cca6c778873f8de810a4bd11bd263df214237538 (patch) | |
tree | 311dd84b12712f34ee6cf9d2c67d99388dc575b6 | |
parent | d230f4cb858482012d27ff66399c63f868163b64 (diff) | |
download | RxCpp-cca6c778873f8de810a4bd11bd263df214237538.tar.gz |
remove some default constructors
-rw-r--r-- | Rx/v2/src/rxcpp/rx-observer.hpp | 7 | ||||
-rw-r--r-- | Rx/v2/src/rxcpp/rx-subscriber.hpp | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/Rx/v2/src/rxcpp/rx-observer.hpp b/Rx/v2/src/rxcpp/rx-observer.hpp index 74946e8..23b58ab 100644 --- a/Rx/v2/src/rxcpp/rx-observer.hpp +++ b/Rx/v2/src/rxcpp/rx-observer.hpp @@ -202,14 +202,13 @@ class observer : public observer_base<T> typedef typename std::decay<I>::type inner_t; inner_t inner; + + observer(); public: ~observer() { } - observer() - { - } - observer(inner_t inner) + explicit observer(inner_t inner) : inner(std::move(inner)) { } diff --git a/Rx/v2/src/rxcpp/rx-subscriber.hpp b/Rx/v2/src/rxcpp/rx-subscriber.hpp index fbf04be..92b672f 100644 --- a/Rx/v2/src/rxcpp/rx-subscriber.hpp +++ b/Rx/v2/src/rxcpp/rx-subscriber.hpp @@ -40,13 +40,11 @@ class subscriber : public subscriber_base<T> const this_type* that; }; + subscriber(); public: typedef typename composite_subscription::weak_subscription weak_subscription; typedef typename composite_subscription::shared_subscription shared_subscription; - subscriber() - { - } template<class U> subscriber(composite_subscription cs, resumption r, U&& o) : lifetime(std::move(cs)) |