Skip to content

Commit

Permalink
Fix a couple of warnings and compiler errors
Browse files Browse the repository at this point in the history
  • Loading branch information
biddisco committed Jan 14, 2017
1 parent f6b6155 commit 89cb53b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions hpx/runtime/actions/basic_action.hpp
Expand Up @@ -101,8 +101,6 @@ namespace hpx { namespace actions
LTM_(debug) << "Executing " << Action::get_action_name(lva_)
<< " with continuation(" << cont_.get_id() << ")";

typedef typename Action::local_result_type local_result_type;

actions::trigger(std::move(cont_), f_);
return threads::thread_result_type(threads::terminated, nullptr);
}
Expand Down
2 changes: 0 additions & 2 deletions hpx/runtime/actions/trigger.hpp
Expand Up @@ -70,8 +70,6 @@ namespace hpx { namespace actions {
auto result = util::invoke(std::forward<F>(f),
std::forward<Ts>(vs)...);

typedef typename hpx::util::decay<decltype(result)>::type future_type;

deferred_trigger trigger;

if(result.is_ready())
Expand Down
2 changes: 1 addition & 1 deletion hpx/util/lightweight_test.hpp
Expand Up @@ -54,7 +54,7 @@ struct fixture
fixture(std::ostream& stream):
stream_(stream), sanity_failures_(0), test_failures_(0)
#if !defined(HPX_HAVE_CXX11_NSDMI)
, mutex_(BOOST_DETAIL_SPINLOCK_INIT)
, mutex_{BOOST_DETAIL_SPINLOCK_INIT}
#endif
{
}
Expand Down
2 changes: 1 addition & 1 deletion hpx/util/spinlock.hpp
Expand Up @@ -33,7 +33,7 @@ struct spinlock
public:
spinlock(char const* /*desc*/ = nullptr)
#if !defined(HPX_HAVE_CXX11_NSDMI)
: m(BOOST_DETAIL_SPINLOCK_INIT)
: m{BOOST_DETAIL_SPINLOCK_INIT}
#endif
{
HPX_ITT_SYNC_CREATE(this, "util::spinlock", "");
Expand Down

0 comments on commit 89cb53b

Please sign in to comment.