Skip to content

<functional> Avoid layers of forwards in invoke #585

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

Merged
Billy O'Neal (BillyONeal) merged 17 commits into from
Mar 5, 2020
Merged

<functional> Avoid layers of forwards in invoke #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9390911
Demacroize invoke.
BillyONeal Feb 29, 2020
3471605
Avoid needless <sstream> in Dev10_729003_bind_reference_wrapper.
BillyONeal Mar 3, 2020
623fe9a
if-constexpr-ize invoke so that there is at most one layer of forward…
BillyONeal Mar 4, 2020
14f948e
_Invoker => _Invoker1
BillyONeal Mar 4, 2020
c5af089
de-forward invoke
BillyONeal Mar 4, 2020
8f38b2f
Workaround DevCom-936696 again.
BillyONeal Mar 4, 2020
df0bd58
git commit -am "Remove some comments and clang-format."
BillyONeal Mar 4, 2020
ab1e828
PR feedback:
BillyONeal Mar 5, 2020
47ec84b
Fix declaration order problem for _Ptr in reference_wrapper, and add …
BillyONeal Mar 5, 2020
e58e3f7
Workaround no noexcept in the type system in C++14 and DevCom-939490.
BillyONeal Mar 5, 2020
ad44e88
clang-format
BillyONeal Mar 5, 2020
0f29c02
Merge remote-tracking branch 'origin/master' into fast_invoke
BillyONeal Mar 5, 2020
45aa3e3
More _C_invokes.
BillyONeal Mar 5, 2020
12913ab
Strengthened => strengthened.
BillyONeal Mar 5, 2020
ff9e9f5
Casey CR changes
BillyONeal Mar 5, 2020
765672a
One more nitpick.
BillyONeal Mar 5, 2020
96b9b44
clang-format
BillyONeal Mar 5, 2020
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 stl/inc/__msvc_all_public_headers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) Microsoft Corporation.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// This file is intended as a test resource for tools that want to verify that they can parse all MSVC++ standard
// This file is intended as a test resource for tools that want to verify that they can parse all MSVC standard
// library headers without warnings. This file disables deprecations, so it should not be included in programs directly.
//
// This file may be changed, renamed, or removed at any time.
Expand Down
30 changes: 15 additions & 15 deletions stl/inc/algorithm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
_C_invoke(_Func, _C_invoke(_Proj, *_UFirst));
_STD invoke(_Func, _STD invoke(_Proj, *_UFirst));
}

_Seek_wrapped(_First, _STD move(_UFirst));
Expand Down Expand Up @@ -336,7 +336,7 @@ namespace ranges {
if (0 < _Count) {
auto _UFirst = _Get_unwrapped_n(_STD move(_First), _Count);
do {
_C_invoke(_Func, _C_invoke(_Proj, *_UFirst));
_STD invoke(_Func, _STD invoke(_Proj, *_UFirst));
--_Count;
++_UFirst;
} while (0 < _Count);
Expand Down Expand Up @@ -364,7 +364,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Proj, *_UFirst) == _Val) {
if (_STD invoke(_Proj, *_UFirst) == _Val) {
break;
}
}
Expand Down Expand Up @@ -407,7 +407,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
break;
}
}
Expand Down Expand Up @@ -465,7 +465,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (!_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (!_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
break;
}
}
Expand Down Expand Up @@ -541,7 +541,7 @@ namespace ranges {
iter_difference_t<_It> _Count = 0;

for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Proj, *_UFirst) == _Val) {
if (_STD invoke(_Proj, *_UFirst) == _Val) {
++_Count;
}
}
Expand Down Expand Up @@ -600,7 +600,7 @@ namespace ranges {
const auto _ULast = _Get_unwrapped(_STD move(_Last));
iter_difference_t<_It> _Count = 0;
for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
++_Count;
}
}
Expand Down Expand Up @@ -811,7 +811,7 @@ namespace ranges {
auto _UFirst2 = _Get_unwrapped(_STD move(_First2));

for (; _Count != 0; ++_UFirst1, (void) ++_UFirst2, --_Count) {
if (!_C_invoke(_Pred, _C_invoke(_Proj1, *_UFirst1), _C_invoke(_Proj2, *_UFirst2))) {
if (!_STD invoke(_Pred, _STD invoke(_Proj1, *_UFirst1), _STD invoke(_Proj2, *_UFirst2))) {
break;
}
}
Expand All @@ -830,7 +830,7 @@ namespace ranges {
const auto _ULast2 = _Get_unwrapped(_STD move(_Last2));

for (; _UFirst1 != _ULast1 && _UFirst2 != _ULast2; ++_UFirst1, (void) ++_UFirst2) {
if (!_C_invoke(_Pred, _C_invoke(_Proj1, *_UFirst1), _C_invoke(_Proj2, *_UFirst2))) {
if (!_STD invoke(_Pred, _STD invoke(_Proj1, *_UFirst1), _STD invoke(_Proj2, *_UFirst2))) {
break;
}
}
Expand Down Expand Up @@ -899,7 +899,7 @@ namespace ranges {
_NODISCARD static constexpr bool _Equal_count(
_It1 _First1, _It2 _First2, _Size _Count, _Pr _Pred, _Pj1 _Proj1, _Pj2 _Proj2) {
for (; _Count != 0; ++_First1, (void) ++_First2, --_Count) {
if (!_C_invoke(_Pred, _C_invoke(_Proj1, *_First1), _C_invoke(_Proj2, *_First2))) {
if (!_STD invoke(_Pred, _STD invoke(_Proj1, *_First1), _STD invoke(_Proj2, *_First2))) {
return false;
}
}
Expand All @@ -917,7 +917,7 @@ namespace ranges {
return false;
}

if (!_C_invoke(_Pred, _C_invoke(_Proj1, *_First1), _C_invoke(_Proj2, *_First2))) {
if (!_STD invoke(_Pred, _STD invoke(_Proj1, *_First1), _STD invoke(_Proj2, *_First2))) {
return false;
}

Expand Down Expand Up @@ -1017,7 +1017,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (!_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (!_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
return false;
}
}
Expand Down Expand Up @@ -1071,7 +1071,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
return true;
}
}
Expand Down Expand Up @@ -1125,7 +1125,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
return false;
}
}
Expand Down Expand Up @@ -1280,7 +1280,7 @@ namespace ranges {
auto _UFirst = _Get_unwrapped(_STD move(_First));
const auto _ULast = _Get_unwrapped(_STD move(_Last));
for (; _UFirst != _ULast; ++_UFirst) {
if (_C_invoke(_Pred, _C_invoke(_Proj, *_UFirst))) {
if (_STD invoke(_Pred, _STD invoke(_Proj, *_UFirst))) {
*_Result = *_UFirst;
++_Result;
}
Expand Down
2 changes: 1 addition & 1 deletion stl/inc/tuple
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -949,7 +949,7 @@ _NODISCARD constexpr typename _Tuple_cat1<_Tuples...>::type tuple_cat(_Tuples&&.
template <class _Callable, class _Tuple, size_t... _Indices>
constexpr decltype(auto) _Apply_impl(
_Callable&& _Obj, _Tuple&& _Tpl, index_sequence<_Indices...>) { // invoke _Obj with the elements of _Tpl
return _C_invoke(_STD forward<_Callable>(_Obj), _STD get<_Indices>(_STD forward<_Tuple>(_Tpl))...);
return _STD invoke(_STD forward<_Callable>(_Obj), _STD get<_Indices>(_STD forward<_Tuple>(_Tpl))...);
}
#pragma warning(pop)

Expand Down
Loading