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

Fix warnings emitted by emscripten compiler #478

Merged
merged 1 commit into from
Jul 28, 2022
Merged

Fix warnings emitted by emscripten compiler #478

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stlab/forest.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ class forest {
return *this = forest(x);
}
forest& operator=(forest&& x) noexcept {
auto tmp{move(x)}; // this is `release()`
auto tmp{std::move(x)}; // this is `release()`
clear(); // these two lines are `reset()`
splice(end(), tmp);
return *this;
Expand Down
3 changes: 1 addition & 2 deletions test/future_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,8 +671,7 @@ BOOST_AUTO_TEST_CASE(future_reduction_with_mutable_void_task) {
BOOST_TEST_MESSAGE("future reduction with mutable task");

std::atomic_int check{0};
auto func = [i = int{0}, &check]() mutable {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be intentionally unused - but the compiler complained. I'm not sure what the purpose of it would be, though. @FelixPetriconi @sean-parent if you wrote this test and want this variable around, let me know.

i++;
auto func = [&check]() mutable {
++check;
};

Expand Down
34 changes: 17 additions & 17 deletions test/future_then_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_void) {
}).then([& _result = result](auto&& x) {
return async(
default_executor, [&_result](auto&& x) { _result = std::move(x); },
forward<move_only>(x));
std::forward<move_only>(x));
});

wait_until_future_completed(sut);
Expand All @@ -370,7 +370,7 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_void) {
}).then([& _result = result](auto&& x) {
return async(
immediate_executor, [&_result](auto&& x) { _result = std::move(x); },
forward<move_only>(x));
std::forward<move_only>(x));
});

BOOST_REQUIRE(sut.get_try());
Expand Down Expand Up @@ -638,7 +638,7 @@ BOOST_AUTO_TEST_CASE(future_async_moving_move_only_capture_to_result) {

move_only m{42};

sut = async(make_executor<0>(), [& _m = m] { return move(_m); });
sut = async(make_executor<0>(), [& _m = m] { return std::move(_m); });

check_valid_future(sut);
auto result = wait_until_future_r_completed(sut);
Expand All @@ -652,7 +652,7 @@ BOOST_AUTO_TEST_CASE(future_async_mutable_move_move_only_capture_to_result) {

move_only m{42};

sut = async(make_executor<0>(), [& _m = m]() { return move(_m); });
sut = async(make_executor<0>(), [& _m = m]() { return std::move(_m); });

check_valid_future(sut);
auto result = wait_until_future_r_completed(sut);
Expand All @@ -667,7 +667,7 @@ BOOST_AUTO_TEST_CASE(future_continuation_moving_move_only_capture_to_result) {
move_only m{42};

sut = async(make_executor<0>(), [] { return move_only{10}; }).then([& _m = m](auto) {
return move(_m);
return std::move(_m);
});

check_valid_future(sut);
Expand All @@ -685,7 +685,7 @@ BOOST_AUTO_TEST_CASE(future_continuation_async_mutable_move_move_only_capture_to

sut = async(make_executor<0>(), []() {
return move_only{10};
}).then([& _m = m](auto) { return move(_m); });
}).then([& _m = m](auto) { return std::move(_m); });

check_valid_future(sut);
auto result = wait_until_future_r_completed(sut);
Expand All @@ -697,7 +697,7 @@ BOOST_AUTO_TEST_CASE(future_continuation_async_mutable_move_move_only_capture_to
move_only m{42};

sut = async(make_executor<0>(), []() { return move_only{10}; }) |
[& _m = m](auto) { return move(_m); };
[& _m = m](auto) { return std::move(_m); };

check_valid_future(sut);
auto result = wait_until_future_r_completed(sut);
Expand All @@ -721,9 +721,9 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_move_only) {
default_executor,
[&_flag](auto&& x) {
_flag = true;
return forward<move_only>(x);
return std::forward<move_only>(x);
},
forward<move_only>(x));
std::forward<move_only>(x));
});

auto result = wait_until_future_r_completed(sut);
Expand All @@ -744,9 +744,9 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_move_only) {
immediate_executor,
[&_flag](auto&& x) {
_flag = true;
return forward<move_only>(x);
return std::forward<move_only>(x);
},
forward<move_only>(x));
std::forward<move_only>(x));
});

auto result = wait_until_future_r_completed(sut);
Expand Down Expand Up @@ -842,10 +842,10 @@ BOOST_AUTO_TEST_CASE(future_int_single_task_get_try_on_rvalue) {

sut = async(make_executor<0>(), [] { return 42; });

auto test_result_1 = move(sut).get_try(); // test for r-value implementation
auto test_result_1 = std::move(sut).get_try(); // test for r-value implementation
(void)test_result_1;
wait_until_future_completed(sut);
auto test_result_2 = move(sut).get_try();
auto test_result_2 = std::move(sut).get_try();

BOOST_REQUIRE_EQUAL(42, *sut.get_try());
BOOST_REQUIRE_EQUAL(42, *test_result_2);
Expand Down Expand Up @@ -1273,7 +1273,7 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_void_when_inner_future_fails)
_check = true;
throw test_exception("failure");
},
forward<move_only>(x));
std::forward<move_only>(x));
});

wait_until_future_fails<test_exception>(sut);
Expand All @@ -1295,7 +1295,7 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_void_when_inner_future_fails)
_check = true;
throw test_exception("failure");
},
forward<move_only>(x));
std::forward<move_only>(x));
});

wait_until_future_fails<test_exception>(sut);
Expand Down Expand Up @@ -1530,7 +1530,7 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_move_only_when_inner_future_f
_flag = true;
throw test_exception("failure");
},
forward<move_only>(x));
std::forward<move_only>(x));
});

wait_until_future_fails<test_exception>(sut);
Expand All @@ -1552,7 +1552,7 @@ BOOST_AUTO_TEST_CASE(reduction_future_move_only_to_move_only_when_inner_future_f
_flag = true;
throw test_exception("failure");
},
forward<move_only>(x));
std::forward<move_only>(x));
});

wait_until_future_fails<test_exception>(sut);
Expand Down