Branch: refs/heads/ref_counted_thread_data
  Home:   https://github.com/STEllAR-GROUP/hpx
  Commit: cea54174bf914ff44971f50d338cce19c341fe7e
      
https://github.com/STEllAR-GROUP/hpx/commit/cea54174bf914ff44971f50d338cce19c341fe7e
  Author: Hartmut Kaiser <[email protected]>
  Date:   2021-08-02 (Mon, 02 Aug 2021)

  Changed paths:
    M 
libs/core/schedulers/include/hpx/schedulers/local_priority_queue_scheduler.hpp
    M libs/core/schedulers/include/hpx/schedulers/thread_queue.hpp
    M libs/core/threading_base/CMakeLists.txt
    M libs/core/threading_base/include/hpx/threading_base/set_thread_state.hpp
    M 
libs/core/threading_base/include/hpx/threading_base/set_thread_state_timed.hpp
    M libs/core/threading_base/src/set_thread_state.cpp
    A libs/core/threading_base/src/set_thread_state_timed.cpp
    M libs/full/init_runtime/src/hpx_init.cpp
    M libs/full/init_runtime_local/src/init_runtime_local.cpp

  Log Message:
  -----------
  Resolving rebase conflicts


_______________________________________________
hpx-commits mailing list
[email protected]
https://mail.cct.lsu.edu/mailman/listinfo/hpx-commits

Reply via email to