Fix rebase

mrc-ide · May 15, 2024 · 8d0d00b · 8d0d00b
1 parent 6aaef74
commit 8d0d00b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/inst/include/dust2/cpu.hpp b/inst/include/dust2/cpu.hpp
@@ -121,6 +121,7 @@ class dust_cpu {
     std::swap(state_, state_next_);
   }
 
+  template <typename Iter>
   void set_state(Iter iter) {
     std::copy_n(iter, state_.size(), state_.begin());
   }

diff --git a/inst/include/dust2/r/helpers.hpp b/inst/include/dust2/r/helpers.hpp
@@ -244,26 +244,5 @@ std::vector<typename T::data_type> check_data(cpp11::list r_data,
   return data;
 }
 
-template <typename T>
-void update_pars(dust_cpu<T>& obj, cpp11::list r_pars, bool grouped) {
-  if (grouped) {
-    const auto n_groups = obj.n_groups();
-    if (r_pars.size() != static_cast<int>(n_groups)) {
-      cpp11::stop("Expected 'pars' to have length %d to match 'n_groups'",
-                  static_cast<int>(n_groups));
-    }
-    for (size_t i = 0; i < n_groups; ++i) {
-      cpp11::list r_pars_i = r_pars[i];
-      obj.update_shared(i, [&] (auto& shared) {
-                             T::update_shared(r_pars_i, shared);
-                            });
-    }
-  } else {
-    obj.update_shared(0, [&] (auto& shared) {
-                           T::update_shared(r_pars, shared);
-                          });
-  }
-}
-
 }
 }