restore default-copy-constructibility of ofEvent (#7969)

Author: artificiel

examples/events/notifyEventExample/src/ofApp.cpp

@@ -27,7 +27,7 @@ void ofApp::update() {
 		}
 	}
 
-	if (auto what = params.parameterChangedE().did_notify()) { // this is the Events::did_notify()
+	if (auto what = params.parameterChangedE().didNotify()) { // this is the Events::did_notify()
 		// something happended in params, but you don't know what
 	}
 }
@@ -41,7 +41,7 @@ void ofApp::draw() {
 		if (size > 100) size -= 100;
 	}
 	ofDrawBitmapString("<a> to toggle automation", 10, 10);
-	ofDrawBitmapString("<s> to randomize size", 10, 20);
+	ofDrawBitmapString("<r> to randomize size", 10, 20);
 	ofDrawBitmapString("<c> to change color", 10, 30);
 }
 

libs/openFrameworks/events/ofEvent.h

@@ -205,7 +205,20 @@ namespace priv{
 		struct Data{
 			Mutex mtx;
 			std::vector<std::shared_ptr<Function>> functions;
+			std::atomic<bool> notified_ { false };
 			bool enabled = true;
+			
+			bool didNotify() {
+				if (notified_.load(std::memory_order_relaxed)) {
+					notified_.store(false, std::memory_order_seq_cst);
+					return true;
+				} else {
+					return false;
+				}
+			}
+			void setNotified(bool state) {
+				notified_.store(state, std::memory_order_relaxed);
+			}
 
 			void remove(const BaseFunctionId & id){
 				std::unique_lock<Mutex> lck(mtx);
@@ -425,9 +438,9 @@ class ofEventListeners{
 		listeners.clear();
 	}
 
-    bool empty() const {
-        return listeners.size() == 0 ;
-    }
+	bool empty() const {
+		return listeners.size() == 0 ;
+	}
 private:
 	std::deque<ofEventListener> listeners;
 };
@@ -566,18 +579,12 @@ class ofEvent: public of::priv::BaseEvent<of::priv::Function<T,Mutex>,Mutex>{
 	/// \brief checks the state of the event
 	/// \returns true if the Event's state was notified since the last check
 	bool didNotify() {
-		if (notified_.load(std::memory_order_relaxed)) {
-			notified_.store(false, std::memory_order_seq_cst);
-			return true;
-		} else {
-			return false;
-		}
+		return ofEvent<T,Mutex>::self->didNotify();
 	}
-	std::atomic<bool> notified_ { false };
-
+	
 	inline bool notify(const void* sender, T & param) {
 		if (ofEvent<T,Mutex>::self->enabled) {
-			notified_.store(true, std::memory_order_relaxed);
+			ofEvent<T,Mutex>::self->setNotified(true);
 			if (!ofEvent<T,Mutex>::self->functions.empty()) {
 				std::unique_lock<Mutex> lck(ofEvent<T,Mutex>::self->mtx);
 				auto functions_copy = ofEvent<T,Mutex>::self->functions;
@@ -729,18 +736,12 @@ class ofEvent<void,Mutex>: public of::priv::BaseEvent<of::priv::Function<void,Mu
 	/// \brief checks the state of the event
 	/// \returns true if the Event's state was notified since the last check
 	bool didNotify() {
-		if (notified_.load(std::memory_order_relaxed)) {
-			notified_.store(false, std::memory_order_seq_cst);
-			return true;
-		} else {
-			return false;
-		}
+		return ofEvent<void,Mutex>::self->didNotify();
 	}
-	std::atomic<bool> notified_;
 
 	bool notify(const void* sender){
 		if(ofEvent<void,Mutex>::self->enabled) {
-			notified_.store(true, std::memory_order_relaxed);
+			ofEvent<void,Mutex>::self->setNotified(true);
 			if (!ofEvent<void,Mutex>::self->functions.empty()) {
 				std::unique_lock<Mutex> lck(ofEvent<void,Mutex>::self->mtx);
 				auto functions_copy = ofEvent<void,Mutex>::self->functions;