#48: resolve some rebase issues

kokkos · Jun 7, 2023 · 4073526 · 4073526
1 parent 68cffa2
commit 4073526
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/resilience/AutomaticCheckpoint.hpp b/src/resilience/AutomaticCheckpoint.hpp
@@ -94,7 +94,9 @@ namespace KokkosResilience
     //Disable ViewHolder hook
     KokkosResilience::DynamicViewHooks::copy_constructor_set.reset();
 
+#ifdef KR_ENABLE_TRACING
     reg_hashes.end();
+#endif
   }
 
   template<typename... Traits, typename RegionFunc, typename FilterFunc, typename... T>

diff --git a/src/resilience/veloc/VelocBackend.cpp b/src/resilience/veloc/VelocBackend.cpp
@@ -221,7 +221,7 @@ fprintf(stderr, "%sing member %s with id %d (%lu members in set)\n", entry.secon
     // No-op, don't do anything
   }
 
-  VeloCFileBackend::VeloCFileBackend(MPIContext<VeloCFileBackend> &,
+  VeloCFileBackend::VeloCFileBackend(MPIContext<VeloCFileBackend> &ctx,
                                      MPI_Comm mpi_comm,
                                      const std::string &veloc_config)
       : m_context(&ctx) {

diff --git a/src/resilience/veloc/VelocBackend.hpp b/src/resilience/veloc/VelocBackend.hpp
@@ -140,7 +140,7 @@ namespace KokkosResilience
     void register_member( KokkosResilience::Registration & ) {} // Do nothing
 
   private:
-      MPIContext< VeloCFileBackend > *m_context;
+      [[maybe_unused]] MPIContext< VeloCFileBackend > *m_context;
       veloc::client_t* veloc_client;
   };
 }