C++20 support do be weird?

arbor-sim · Jan 7, 2025 · e546d5d · e546d5d
1 parent 2cd0f62
commit e546d5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/arbor/backends/event.hpp b/arbor/backends/event.hpp
@@ -39,9 +39,9 @@ struct deliverable_event {
     target_handle handle;
 
     deliverable_event() = default;
-    constexpr deliverable_event(const time_type time,
+    constexpr deliverable_event(time_type time,
                                 target_handle handle,
-                                const float weight) noexcept:
+                                float weight) noexcept:
         time(time), weight(weight), handle(std::move(handle)) {}
 
     ARB_SERDES_ENABLE(deliverable_event, time, weight, handle);
@@ -51,7 +51,7 @@ struct deliverable_event {
 struct deliverable_event_data {
     cell_local_size_type mech_index = 0; // same as target_handle::mech_index
     float weight = 0;
-    deliverable_event_data(const cell_local_size_type idx, const float w) noexcept:
+    deliverable_event_data(cell_local_size_type idx, float w) noexcept:
         mech_index(idx),
         weight(w) {}
     ARB_SERDES_ENABLE(deliverable_event_data,

diff --git a/arbor/backends/event_stream_base.hpp b/arbor/backends/event_stream_base.hpp
@@ -104,7 +104,7 @@ struct spike_event_stream_base: event_stream_base<deliverable_event> {
         }
 
         // loop over lanes: group events by mechanism and sort them by time
-        auto cell = 0;
+        arb_size_type cell = 0;
         for (const auto& lane: lanes) {
             auto div = divs[cell];
             arb_size_type step = 0;
@@ -119,7 +119,7 @@ struct spike_event_stream_base: event_stream_base<deliverable_event> {
                 arb_assert(div + evt.target < handles.size());
                 const auto& handle = handles[div + evt.target];
                 auto& stream = streams[handle.mech_id];
-                stream.spikes_.emplace_back(step, handle.mech_index, evt.time, evt.weight);
+                stream.spikes_.push_back(spike_data(step, handle.mech_index, evt.time, evt.weight));
                 stream.ev_spans_[step + 1]++;
             }
             ++cell;