[sigslots] gcc now needs assignment and copy constructors defined

See oneapi-src/oneTBB#161
stonier · Jul 26, 2020 · 96f3a9c · 96f3a9c
1 parent 858ec0f
commit 96f3a9c
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 4 deletions.
diff --git a/ecl_core_apps/src/benchmarks/eigen3_transforms.cpp b/ecl_core_apps/src/benchmarks/eigen3_transforms.cpp
@@ -68,6 +68,13 @@ class Pose2D {
 		x(x_), y(y_), rotation(theta)
 	{}
 	Pose2D(const Pose2D& pose) : x(pose.x), y(pose.y), rotation(pose.rotation) {}
+
+	void operator=( const Pose2D& pose) {
+		x = pose.x;
+		y = pose.y;
+		rotation = pose.rotation;
+	}
+
 	Pose2D inverse() const {
 		double s = sin(rotation);
 		double c = cos(rotation);

diff --git a/ecl_sigslots/include/ecl/sigslots/signal.hpp b/ecl_sigslots/include/ecl/sigslots/signal.hpp
@@ -74,7 +74,7 @@ class ECL_PUBLIC Signal {
 	 *
 	 * @param signal : the object to be copied.
 	 */
-	Signal(const Signal& signal) {
+	Signal(const Signal<Data>& signal) {
 		*this = signal;
 		sigslot->incrHandles();
 	}
@@ -93,6 +93,13 @@ class ECL_PUBLIC Signal {
 		}
 	}
 
+	/**
+	 * @brief Default assignment operator.
+	 */
+	void operator=( const Signal<Data>& signal) {
+		sigslot = signal.sigslot;
+	}
+
 	/**
 	 * @brief Make a connection to the specified topic.
 	 *
@@ -175,10 +182,18 @@ class ECL_PUBLIC Signal<Void> {
 	 *
 	 * @param signal : the object to be copied.
 	 */
-	Signal(const Signal& signal) {
+	Signal(const Signal<Void>& signal) {
 		*this = signal;
 		sigslot->incrHandles();
 	}
+
+	/**
+	 * @brief Default assignment operator.
+	 */
+	void operator=( const Signal<Void>& signal) {
+		sigslot = signal.sigslot;
+	}
+
 	/**
 	 * @brief Default destructor.
 	 *

diff --git a/ecl_sigslots/include/ecl/sigslots/slot.hpp b/ecl_sigslots/include/ecl/sigslots/slot.hpp
@@ -116,7 +116,7 @@ class ECL_PUBLIC Slot {
 	 *
 	 * @param slot : the object to be copied.
 	 */
-	Slot(const Slot& slot) {
+	Slot(const Slot<Data>& slot) {
 		*this = slot;
 		sigslot->incrHandles();
 	}
@@ -134,6 +134,12 @@ class ECL_PUBLIC Slot {
 			delete sigslot;
 		}
 	}
+	/**
+	 * @brief Default assignment operator.
+	 */
+	void operator=( const Slot<Data>& slot) {
+		sigslot = slot.sigslot;
+	}
 	/**
 	 * @brief Lists the topics this slot is connected to.
 	 *
@@ -239,7 +245,7 @@ class ECL_PUBLIC Slot<Void> {
 	 *
 	 * @param slot : the object to be copied.
 	 */
-	Slot(const Slot& slot) {
+	Slot(const Slot<Void>& slot) {
 		*this = slot;
 		sigslot->incrHandles();
 	}
@@ -256,6 +262,12 @@ class ECL_PUBLIC Slot<Void> {
 			delete sigslot;
 		}
 	}
+	/**
+	 * @brief Default assignment operator.
+	 */
+	void operator=( const Slot<Void>& slot) {
+		sigslot = slot.sigslot;
+	}
 	/**
 	 * @brief Make a connection to the specified topic.
 	 *