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.

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

Fix small typos #2973

Merged
merged 1 commit into from Oct 27, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -398,7 +398,7 @@ HPX is currently funded by
authors expressed herein do not necessarily state or reflect those of the
United States Government or any agency thereof.

* The Bavarian Research Foundation (Bayerische Forschungsstfitung) through
* The Bavarian Research Foundation (Bayerische Forschungsstiftung) through
the grant AZ-987-11.

* The European Commission's Horizon 2020 programme through the grant
Expand Down
2 changes: 1 addition & 1 deletion hpx/runtime/threads/detail/scheduling_loop.hpp
Expand Up @@ -666,7 +666,7 @@ namespace hpx { namespace threads { namespace detail
if (scheduler.SchedulingPolicy::wait_or_add_new(
num_thread, running, idle_loop_count))
{
// clean up terminated threads one more time before existing
// clean up terminated threads one more time before exiting
if (scheduler.SchedulingPolicy::cleanup_terminated(true))
{
// if this is an inner scheduler, exit immediately
Expand Down
2 changes: 1 addition & 1 deletion hpx/runtime/threads/thread_data.hpp
Expand Up @@ -77,7 +77,7 @@ namespace hpx { namespace threads
/// - A block of registers (not implemented yet)
///
/// Generally, \a threads are not created or executed directly. All
/// functionality related to the management of \a thread's is
/// functionality related to the management of \a threads is
/// implemented by the thread-manager.
class thread_data
{
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/applier/applier.cpp
Expand Up @@ -178,7 +178,7 @@ namespace hpx { namespace applier
}

util::thread_description d =
desc ? desc : util::thread_description(func, "register_thread_nullary");
desc ? desc : util::thread_description(func, "register_work_nullary");

threads::thread_init_data data(
util::bind(util::one_shot(&thread_function_nullary), std::move(func)),
Expand Down