Skip to content

util: Change TraceThread's "name" type: "const char*" -> "const std::string" #3609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
UdjinM6 merged 1 commit into from
Jul 14, 2020
Merged

util: Change TraceThread's "name" type: "const char*" -> "const std::string" #3609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,9 @@ void RenameThreadPool(ctpl::thread_pool& tp, const char* baseName);
/**
* .. and a wrapper that just calls func once
*/
template <typename Callable> void TraceThread(const char* name, Callable func)
template <typename Callable> void TraceThread(const std::string name, Callable func)
{
std::string s = strprintf("dash-%s", name);
std::string s = "dash-" + name;
RenameThread(s.c_str());
try
{
Expand All @@ -450,7 +450,7 @@ template <typename Callable> void TraceThread(const char* name, Callable func)
throw;
}
catch (...) {
PrintExceptionContinue(std::current_exception(), name);
PrintExceptionContinue(std::current_exception(), name.c_str());
throw;
}
}
Expand Down