From 7e0c58d1dbc79858d793612c2edbecd2b86d342a Mon Sep 17 00:00:00 2001 From: Bob Somers Date: Sun, 24 Aug 2014 05:57:12 -0700 Subject: [PATCH 1/3] Change TimestampT in EventLog back to system_clock. --- include/react/logging/EventLog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/react/logging/EventLog.h b/include/react/logging/EventLog.h index e9622c7b..0e87cf05 100644 --- a/include/react/logging/EventLog.h +++ b/include/react/logging/EventLog.h @@ -29,7 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// class EventLog { - using TimestampT = std::chrono::time_point; + using TimestampT = std::chrono::time_point; class Entry { From f4b0a12444ac4cdedc28fcf1ac5380023e74ed1d Mon Sep 17 00:00:00 2001 From: Kyle Fleming Date: Tue, 28 Jul 2015 18:51:25 -0700 Subject: [PATCH 2/3] Fix ReactiveBase move assignment compile error --- include/react/detail/ReactiveBase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/react/detail/ReactiveBase.h b/include/react/detail/ReactiveBase.h index d7f32124..97d28a24 100644 --- a/include/react/detail/ReactiveBase.h +++ b/include/react/detail/ReactiveBase.h @@ -61,7 +61,7 @@ class ReactiveBase // Move assignment ReactiveBase& operator=(ReactiveBase&& other) { - ptr_.reset(std::move(other)); + ptr_ = std::move(other.ptr_); return *this; } From a3044fee314cac74892659d98d41f26c4f1b4d4c Mon Sep 17 00:00:00 2001 From: Kyle Fleming Date: Wed, 5 Aug 2015 21:16:58 -0700 Subject: [PATCH 3/3] Fix ScopedObserver move assignment --- include/react/Observer.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/react/Observer.h b/include/react/Observer.h index 45fd78a1..db690998 100644 --- a/include/react/Observer.h +++ b/include/react/Observer.h @@ -130,6 +130,7 @@ class ScopedObserver ScopedObserver& operator=(ScopedObserver&& other) { obs_ = std::move(other.obs_); + return *this; } // Deleted default ctor, copy ctor and assignment @@ -139,7 +140,8 @@ class ScopedObserver ~ScopedObserver() { - obs_.Detach(); + if (obs_.IsValid()) + obs_.Detach(); } bool IsValid() const