* Added logging of severe diagnostics events to log at warning level. graph::set_tag...

[casparcg] / common / reactive.h

diff --git a/common/reactive.h b/common/reactive.h
index d9140f6cae8167e24a0e289fc890f2d588249871..4e91b5444bbd6cd69cb47b85f0ef746916354564 100644 (file)
--- a/common/reactive.h
+++ b/common/reactive.h
@@ -86,9 +86,9 @@ public:
 
        // Static Members
 
-       typedef T                                               value_type;
-       typedef observer<T>                             observer;
-       typedef std::weak_ptr<observer> observer_ptr;
+       typedef T                                                                               value_type;
+       typedef reactive::observer<T>                                   observer;
+       typedef std::weak_ptr<reactive::observer<T>>    observer_ptr;
        
        // Constructors
 
@@ -167,7 +167,6 @@ public:
        void swap(observer_function& other)
        {
                std::swap(func_, other.func_);
-               std::swap(filter_, other.filter_);
        }
                
        void on_next(const T& e) override
@@ -181,7 +180,7 @@ private:
 };
 
 template<typename I, typename O = I>
-class basic_subject_impl /* final */ : public subject<I, O>
+class basic_subject_impl final : public subject<I, O>
 {      
     template <typename, typename> friend class basic_subject_impl;
 
@@ -306,7 +305,7 @@ public:
        {
        }
                
-       basic_subject(subject&& other)
+       basic_subject(basic_subject&& other)
                : impl_(std::move(other.impl_))
        {
        }
@@ -353,7 +352,7 @@ template<typename F>
 spl::shared_ptr<observer_function<typename std::decay<typename detail::function_traits<F>::arg1_type>::type, F>> 
 make_observer(F func)
 {
-       return spl::make_shared<observer_function<std::decay<typename detail::function_traits<F>::arg1_type>::type, F>>(std::move(func));
+       return spl::make_shared<observer_function<typename std::decay<typename detail::function_traits<F>::arg1_type>::type, F>>(std::move(func));
 }
 
 template<typename T>
@@ -363,4 +362,4 @@ basic_subject<T>& operator<<(basic_subject<T>& s, const T& val)
        return s;
 }
 
-}}
\ No newline at end of file
+}}