Fix/v4.1.1.compiler errors

Rx/v2/src/rxcpp/operators/rx-amb.hpp

@@ -99,8 +99,7 @@ struct amb
         typedef Subscriber output_type;
 
         struct amb_state_type
-            : public std::enable_shared_from_this<amb_state_type>
-            , public values
+            : public values
         {
             amb_state_type(values i, coordinator_type coor, output_type oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-combine_latest.hpp

@@ -167,9 +167,7 @@ struct combine_latest : public operator_base<rxu::value_type_t<combine_latest_tr
                 value.reset(st);
 
                 if (state->valuesSet == sizeof... (ObservableN)) {
-                    auto values = rxu::surely(state->latest);
-                    auto selectedResult = rxu::apply(values, state->selector);
-                    state->out.on_next(selectedResult);
+                    state->out.on_next(rxu::apply(rxu::surely(state->latest), state->selector));
                 }
             },
         // on_error
@@ -204,8 +202,7 @@ struct combine_latest : public operator_base<rxu::value_type_t<combine_latest_tr
         typedef Subscriber output_type;
 
         struct combine_latest_state_type
-            : public std::enable_shared_from_this<combine_latest_state_type>
-            , public values
+            : public values
         {
             combine_latest_state_type(values i, coordinator_type coor, output_type oarg)
                 : values(std::move(i))

Rx/v2/src/rxcpp/operators/rx-concat_map.hpp

@@ -111,6 +111,8 @@ struct concat_map
             , coordination(std::move(sf))
         {
         }
+        values(values const& o) = default;
+        values(values&& o) = default;
         source_type source;
         collection_selector_type selectCollection;
         result_selector_type selectResult;
@@ -125,6 +127,9 @@ struct concat_map
     {
     }
 
+    concat_map(concat_map const& o) = default;
+    concat_map(concat_map&& o) = default;
+
     template<class Subscriber>
     void on_subscribe(Subscriber scbr) const {
         static_assert(is_subscriber<Subscriber>::value, "subscribe must be passed a subscriber");

Rx/v2/src/rxcpp/operators/rx-flat_map.hpp

@@ -128,8 +128,7 @@ struct flat_map
         typedef Subscriber output_type;
 
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(values i, coordinator_type coor, output_type oarg)
                 : values(std::move(i))
@@ -194,8 +193,7 @@ struct flat_map
                     innercs,
                 // on_next
                     [state, st](collection_value_type ct) {
-                        auto selectedResult = state->selectResult(st, std::move(ct));
-                        state->out.on_next(std::move(selectedResult));
+                        state->out.on_next(state->selectResult(st, std::move(ct)));
                     },
                 // on_error
                     [state](rxu::error_ptr e) {

Rx/v2/src/rxcpp/operators/rx-merge.hpp

@@ -103,8 +103,7 @@ struct merge
         typedef Subscriber output_type;
 
         struct merge_state_type
-            : public std::enable_shared_from_this<merge_state_type>
-            , public values
+            : public values
         {
             merge_state_type(values i, coordinator_type coor, output_type oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-merge_delay_error.hpp

@@ -96,8 +96,7 @@ struct merge_delay_error
                 typedef Subscriber output_type;
 
                 struct merge_state_type
-                        : public std::enable_shared_from_this<merge_state_type>
-                        , public values
+                        : public values
                 {
                         merge_state_type(values i, coordinator_type coor, output_type oarg)
                                 : values(i)

Rx/v2/src/rxcpp/operators/rx-multicast.hpp

@@ -38,7 +38,7 @@ struct multicast : public operator_base<T>
     typedef rxu::decay_t<Observable> source_type;
     typedef rxu::decay_t<Subject> subject_type;
 
-    struct multicast_state : public std::enable_shared_from_this<multicast_state>
+    struct multicast_state
     {
         multicast_state(source_type o, subject_type sub)
             : source(std::move(o))

Rx/v2/src/rxcpp/operators/rx-reduce.hpp

@@ -141,7 +141,6 @@ struct reduce : public operator_base<rxu::value_type_t<reduce_traits<T, Observab
     void on_subscribe(Subscriber o) const {
         struct reduce_state_type
             : public reduce_initial_type
-            , public std::enable_shared_from_this<reduce_state_type>
         {
             reduce_state_type(reduce_initial_type i, Subscriber scrbr)
                 : reduce_initial_type(i)

Rx/v2/src/rxcpp/operators/rx-ref_count.hpp

@@ -93,8 +93,7 @@ struct ref_count : public operator_base<T>
     // removed constexpr to support older VC compilers
     static /*constexpr */ const bool has_observable_v = has_observable_t::value;
 
-    struct ref_count_state : public std::enable_shared_from_this<ref_count_state>,
-                             public ref_count_state_base<ConnectableObservable, Observable>
+    struct ref_count_state : public ref_count_state_base<ConnectableObservable, Observable>
     {
         template <class HasObservable = has_observable_t,
                   class Enabled = rxu::enable_if_all_true_type_t<

Rx/v2/src/rxcpp/operators/rx-scan.hpp

@@ -70,7 +70,6 @@ struct scan : public operator_base<rxu::decay_t<Seed>>
     void on_subscribe(Subscriber o) const {
         struct scan_state_type
             : public scan_initial_type
-            , public std::enable_shared_from_this<scan_state_type>
         {
             scan_state_type(scan_initial_type i, Subscriber scrbr)
                 : scan_initial_type(i)

Rx/v2/src/rxcpp/operators/rx-sequence_equal.hpp

@@ -81,8 +81,7 @@ struct sequence_equal : public operator_base<bool>
         typedef Subscriber output_type;
 
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(const values& vals, coordinator_type coor, const output_type& o)
                 : values(vals)

Rx/v2/src/rxcpp/operators/rx-skip.hpp

@@ -76,8 +76,7 @@ struct skip : public operator_base<T>
 
         typedef Subscriber output_type;
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(const values& i, const output_type& oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-skip_last.hpp

@@ -69,8 +69,7 @@ struct skip_last : public operator_base<T>
 
         typedef Subscriber output_type;
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(const values& i, const output_type& oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-skip_until.hpp

@@ -87,8 +87,7 @@ struct skip_until : public operator_base<T>
 
         typedef Subscriber output_type;
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(const values& i, coordinator_type coor, const output_type& oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-subscribe_on.hpp

@@ -77,8 +77,7 @@ struct subscribe_on : public operator_base<T>
 
         typedef Subscriber output_type;
         struct subscribe_on_state_type
-            : public std::enable_shared_from_this<subscribe_on_state_type>
-            , public subscribe_on_values
+            : public subscribe_on_values
         {
             subscribe_on_state_type(const subscribe_on_values& i, const output_type& oarg)
                 : subscribe_on_values(i)

Rx/v2/src/rxcpp/operators/rx-switch_on_next.hpp

@@ -82,8 +82,7 @@ struct switch_on_next
         typedef Subscriber output_type;
 
         struct switch_state_type
-            : public std::enable_shared_from_this<switch_state_type>
-            , public values
+            : public values
         {
             switch_state_type(values i, coordinator_type coor, output_type oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-take.hpp

@@ -75,8 +75,7 @@ struct take : public operator_base<T>
 
         typedef Subscriber output_type;
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(const values& i, const output_type& oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-take_last.hpp

@@ -69,8 +69,7 @@ struct take_last : public operator_base<T>
 
         typedef Subscriber output_type;
         struct state_type
-            : public std::enable_shared_from_this<state_type>
-            , public values
+            : public values
         {
             state_type(const values& i, const output_type& oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-take_until.hpp

@@ -97,8 +97,7 @@ struct take_until : public operator_base<T>
 
         typedef Subscriber output_type;
         struct take_until_state_type
-            : public std::enable_shared_from_this<take_until_state_type>
-            , public values
+            : public values
         {
             take_until_state_type(const values& i, coordinator_type coor, const output_type& oarg)
                 : values(i)

Rx/v2/src/rxcpp/operators/rx-with_latest_from.hpp

@@ -167,9 +167,7 @@ struct with_latest_from : public operator_base<rxu::value_type_t<with_latest_fro
                 value.reset(st);
 
                 if (state->valuesSet == sizeof... (ObservableN) && Index == 0) {
-                    auto values = rxu::surely(state->latest);
-                    auto selectedResult = rxu::apply(values, state->selector);
-                    state->out.on_next(selectedResult);
+                    state->out.on_next(rxu::apply(rxu::surely(state->latest), state->selector));
                 }
             },
         // on_error
@@ -204,8 +202,7 @@ struct with_latest_from : public operator_base<rxu::value_type_t<with_latest_fro
         typedef Subscriber output_type;
 
         struct with_latest_from_state_type
-            : public std::enable_shared_from_this<with_latest_from_state_type>
-            , public values
+            : public values
         {
             with_latest_from_state_type(values i, coordinator_type coor, output_type oarg)
                 : values(std::move(i))

Rx/v2/src/rxcpp/operators/rx-zip.hpp

@@ -195,8 +195,8 @@ struct zip : public operator_base<rxu::value_type_t<zip_traits<Coordination, Sel
                 auto& values = std::get<Index>(state->pending).values;
                 values.push_back(st);
                 if (rxu::apply_to_each(state->pending, values_not_empty(), rxu::all_values_true())) {
-                    auto selectedResult = rxu::apply_to_each(state->pending, extract_value_front(), state->selector);
-                    state->out.on_next(selectedResult);
+
+                    state->out.on_next(rxu::apply_to_each(state->pending, extract_value_front(), state->selector));
                 }
                 if (rxu::apply_to_each(state->pending, source_completed_values_empty(), rxu::any_value_true())) {
                     state->out.on_completed();
@@ -236,8 +236,7 @@ struct zip : public operator_base<rxu::value_type_t<zip_traits<Coordination, Sel
         typedef Subscriber output_type;
 
         struct zip_state_type
-            : public std::enable_shared_from_this<zip_state_type>
-            , public values
+            : public values
         {
             zip_state_type(values i, coordinator_type coor, output_type oarg)
                 : values(std::move(i))

Rx/v2/src/rxcpp/rx-connectable_observable.hpp

@@ -31,7 +31,6 @@ class dynamic_connectable_observable
     : public dynamic_observable<T>
 {
     struct state_type
-        : public std::enable_shared_from_this<state_type>
     {
         typedef std::function<void(composite_subscription)> onconnect_type;
 

Rx/v2/src/rxcpp/rx-coroutine.hpp

@@ -34,7 +34,7 @@ template<typename Source>
 struct co_observable_iterator;
 
 template<typename Source>
-struct co_observable_iterator_state : std::enable_shared_from_this<co_observable_iterator_state<Source>>
+struct co_observable_iterator_state
 {
     using value_type = typename Source::value_type;
 
@@ -69,9 +69,13 @@ struct co_observable_inc_awaiter
 };
 
 template<typename Source>
-struct co_observable_iterator : public iterator<input_iterator_tag, typename Source::value_type>
+struct co_observable_iterator
 {
+    using iterator_category = input_iterator_tag;
+    using difference_type   = std::ptrdiff_t;
     using value_type = typename Source::value_type;
+    using pointer = value_type*;
+    using reference = value_type&;
 
     co_observable_iterator() {}
 

Rx/v2/src/rxcpp/rx-grouped_observable.hpp

@@ -36,7 +36,6 @@ class dynamic_grouped_observable
 
 private:
     struct state_type
-        : public std::enable_shared_from_this<state_type>
     {
         typedef std::function<key_type()> ongetkey_type;
 

Rx/v2/src/rxcpp/rx-notification.hpp

@@ -44,7 +44,6 @@ namespace detail {
 
 template<typename T>
 struct notification_base
-    : public std::enable_shared_from_this<notification_base<T>>
 {
     typedef subscriber<T> observer_type;
     typedef std::shared_ptr<notification_base<T>> type;

Rx/v2/src/rxcpp/rx-observable.hpp

@@ -37,7 +37,6 @@ class dynamic_observable
     : public rxs::source_base<T>
 {
     struct state_type
-        : public std::enable_shared_from_this<state_type>
     {
         typedef std::function<void(subscriber<T>)> onsubscribe_type;
 

Rx/v2/src/rxcpp/rx-observer.hpp

@@ -347,7 +347,7 @@ namespace detail
 {
 
 template<class T>
-struct virtual_observer : public std::enable_shared_from_this<virtual_observer<T>>
+struct virtual_observer
 {
     virtual ~virtual_observer() {}
     virtual void on_next(T&) const {};

Rx/v2/src/rxcpp/rx-scheduler.hpp

@@ -161,7 +161,6 @@ struct worker_base : public subscription_base
 };
 
 class worker_interface
-    : public std::enable_shared_from_this<worker_interface>
 {
     typedef worker_interface this_type;
 
@@ -652,7 +651,6 @@ struct current_thread;
 namespace detail {
 
 class action_type
-    : public std::enable_shared_from_this<action_type>
 {
     typedef action_type this_type;
 
@@ -681,7 +679,6 @@ class action_type
 };
 
 class action_tailrecurser
-    : public std::enable_shared_from_this<action_type>
 {
     typedef action_type this_type;
 

Rx/v2/src/rxcpp/rx-subscription.hpp

@@ -66,7 +66,7 @@ class static_subscription
 
 class subscription : public subscription_base
 {
-    class base_subscription_state : public std::enable_shared_from_this<base_subscription_state>
+    class base_subscription_state
     {
         base_subscription_state();
     public:
@@ -243,7 +243,7 @@ class composite_subscription_inner
 {
 private:
     typedef subscription::weak_state_type weak_subscription;
-    struct composite_subscription_state : public std::enable_shared_from_this<composite_subscription_state>
+    struct composite_subscription_state
     {
         // invariant: cannot access this data without the lock held.
         std::set<subscription> subscriptions;