Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
aurianer committed Aug 26, 2020
2 parents 5b2572c + a5212b4 commit f770fe4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion libs/async_cuda/include/hpx/async_cuda/cuda_future.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ namespace hpx { namespace cuda { namespace experimental {

// -----------------------------------------------------------------
// This RAII helper class enables polling for a scoped block
struct enable_user_polling
struct HPX_NODISCARD enable_user_polling
{
enable_user_polling(std::string const& pool_name = "")
: pool_name_(pool_name)
Expand Down
2 changes: 1 addition & 1 deletion libs/async_mpi/include/hpx/async_mpi/mpi_future.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ namespace hpx { namespace mpi { namespace experimental {
// -----------------------------------------------------------------
// This RAII helper class assumes that MPI initialization/finalization is
// handled elsewhere
struct enable_user_polling
struct HPX_NODISCARD enable_user_polling
{
enable_user_polling(std::string const& pool_name = "")
: pool_name_(pool_name)
Expand Down

0 comments on commit f770fe4

Please sign in to comment.