From 873d5be8fbe79350618c5560cd94f97e82649fe6 Mon Sep 17 00:00:00 2001
From: Sam Yates <sam@quux.dropbear.id.au>
Date: Fri, 4 Oct 2019 14:26:12 +0200
Subject: [PATCH] Fix default assignment warning for cv_policy. (#888)
* Provide correct assignment operator.
---
arbor/include/arbor/cable_cell_param.hpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/arbor/include/arbor/cable_cell_param.hpp b/arbor/include/arbor/cable_cell_param.hpp
index 0de0dff5..92b1822c 100644
--- a/arbor/include/arbor/cable_cell_param.hpp
+++ b/arbor/include/arbor/cable_cell_param.hpp
@@ -157,12 +157,15 @@ struct cv_policy {
policy_ptr = ref.clone();
}
- cv_policy(cv_policy&&) = default;
-
cv_policy(const cv_policy& other):
policy_ptr(other.policy_ptr->clone()) {}
- cv_policy& operator=(const cv_policy&) = default;
+ cv_policy& operator=(const cv_policy& other) {
+ policy_ptr = other.policy_ptr->clone();
+ return *this;
+ }
+
+ cv_policy(cv_policy&&) = default;
cv_policy& operator=(cv_policy&&) = default;
locset cv_boundary_points(const cable_cell& cell) const {
--
GitLab