Fix device build errors

sethrj · Apr 28, 2024 · 2c44958 · 2c44958
1 parent 9bb78d4
commit 2c44958
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/celeritas/global/ActionLauncher.device.hh b/src/celeritas/global/ActionLauncher.device.hh
@@ -75,7 +75,7 @@ class ActionLauncher
 
     //! Create a launcher with a string extension
     ActionLauncher(ExplicitActionInterface const& action, std::string_view ext)
-        : ActionLauncher{action.label() + "-" + std::string(ext)}
+        : ActionLauncher{std::string(action.label()) + "-" + std::string(ext)}
     {
     }
 

diff --git a/src/corecel/sys/ScopedProfiling.cuda.cc b/src/corecel/sys/ScopedProfiling.cuda.cc
@@ -42,20 +42,21 @@ nvtxStringHandle_t message_handle_for(std::string_view message)
     static std::unordered_map<std::string, nvtxStringHandle_t> registry;
     static std::shared_mutex mutex;
 
+    std::string temp_message{message};
     {
         std::shared_lock lock(mutex);
 
-        if (auto message_handle = registry.find(message);
+        if (auto message_handle = registry.find(temp_message);
             message_handle != registry.end())
         {
             return message_handle->second;
         }
     }
 
     // We did not find the handle; try to insert it
-    auto [iter, inserted] = [message] {
+    auto [iter, inserted] = [&temp_message] {
         std::unique_lock lock(mutex);
-        return registry.insert({std::string{message}, {}});
+        return registry.insert({std::move(temp_message), {}});
     }();
     if (inserted)
     {