Skip to content
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

Jump to bottom

[9.4] Take over #14035: Get rid of some warnings from defining Threads::new_thread(). #14036

Merged
merged 1 commit into from
Jun 23, 2022
Merged

[9.4] Take over #14035: Get rid of some warnings from defining Threads::new_thread(). #14036

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions include/deal.II/base/thread_management.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,13 @@ namespace Threads
DEAL_II_DEPRECATED inline Thread<RT>
new_thread(const std::function<RT()> &function)
{
// Here and below we need to disable deprecation warnings for calling the
// constructor in this function - as this function itself is deprecated
// these warnings are not helpful. This problem only appears in some
// configurations (e.g., Debian 11 with GCC-10).
DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
return Thread<RT>(function);
DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
}


Expand Down Expand Up @@ -835,8 +841,11 @@ namespace Threads
new_thread(FunctionObjectType function_object)
-> Thread<decltype(function_object())>
{
// See the comment in the first new_thread() implementation
DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
using return_type = decltype(function_object());
return Thread<return_type>(std::function<return_type()>(function_object));
DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
}


Expand All @@ -853,9 +862,12 @@ namespace Threads
DEAL_II_DEPRECATED inline Thread<RT>
new_thread(RT (*fun_ptr)(Args...), typename identity<Args>::type... args)
{
// See the comment in the first new_thread() implementation
DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
auto dummy = std::make_tuple(internal::maybe_make_ref<Args>::act(args)...);
return new_thread(
[dummy, fun_ptr]() -> RT { return std_cxx17::apply(fun_ptr, dummy); });
DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
}


Expand Down Expand Up @@ -891,9 +903,12 @@ namespace Threads
typename identity<const C>::type &c,
typename identity<Args>::type... args)
{
// See the comment in the first new_thread() implementation
DEAL_II_DISABLE_EXTRA_DIAGNOSTICS
// NOLINTNEXTLINE(modernize-avoid-bind) silence clang-tidy
return new_thread(std::function<RT()>(std::bind(
fun_ptr, std::cref(c), internal::maybe_make_ref<Args>::act(args)...)));
DEAL_II_ENABLE_EXTRA_DIAGNOSTICS
}

// ------------------------ ThreadGroup -------------------------------------
Expand Down