#1554: DR: return a shared_ptr

DARMA-tasking · Oct 4, 2021 · 666fec9 · 666fec9
1 parent eab57e9
commit 666fec9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/examples/hello_world/hello_world.cc b/examples/hello_world/hello_world.cc
@@ -62,7 +62,7 @@ static void hello_world(HelloMsg* msg) {
   my_reader.fetch(0);
   vt::theSched()->runSchedulerWhile([&]{ return not my_reader.isReady(); });
   auto const& vec = my_reader.get(0);
-  for (auto&& elm : vec) {
+  for (auto&& elm : *vec) {
     vt_print(gen, "elm={}\n", elm);
   }
   fmt::print("{}: Hello from node {}\n", this_node, msg->from);

diff --git a/src/vt/datarep/reader.h b/src/vt/datarep/reader.h
@@ -65,7 +65,7 @@ struct Reader : ReaderBase {
 
   void fetch(DataVersionType version);
 
-  T const& get(DataVersionType version) const;
+  std::shared_ptr<T const> get(DataVersionType version) const;
 
 private:
   friend struct DataReplicator;

diff --git a/src/vt/datarep/reader.impl.h b/src/vt/datarep/reader.impl.h
@@ -55,10 +55,10 @@ void Reader<T>::fetch(DataVersionType version) {
 }
 
 template <typename T>
-T const& Reader<T>::get(DataVersionType version) const {
+std::shared_ptr<T const> Reader<T>::get(DataVersionType version) const {
   vtAssert(ready_, "Data must be ready to get it");
   vtAssert(data_ != nullptr, "Must have data");
-  return *data_;
+  return data_;
 }
 
 }} /* end namespace vt::datarep */