Skip to content

Make invoke constexpr available in all modes #4134

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
Stephan T. Lavavej (StephanTLavavej) merged 2 commits into from
Nov 7, 2023
Merged

Make invoke constexpr available in all modes #4134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93a6065
Make invoke constexpr available in all modes
grcm10 Oct 29, 2023
f0e5aa1
Update comments.
StephanTLavavej Oct 30, 2023
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
4 changes: 2 additions & 2 deletions stl/inc/type_traits
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,13 +1724,13 @@ template <class _Callable, class _Ty1, class _Removed_cvref>
struct _Invoker1<_Callable, _Ty1, _Removed_cvref, false, false> : _Invoker_functor {};

_EXPORT_STD template <class _Callable>
_CONSTEXPR17 auto invoke(_Callable&& _Obj) noexcept(noexcept(static_cast<_Callable&&>(_Obj)()))
constexpr auto invoke(_Callable&& _Obj) noexcept(noexcept(static_cast<_Callable&&>(_Obj)()))
-> decltype(static_cast<_Callable&&>(_Obj)()) {
return static_cast<_Callable&&>(_Obj)();
}

_EXPORT_STD template <class _Callable, class _Ty1, class... _Types2>
_CONSTEXPR17 auto invoke(_Callable&& _Obj, _Ty1&& _Arg1, _Types2&&... _Args2) noexcept(
constexpr auto invoke(_Callable&& _Obj, _Ty1&& _Arg1, _Types2&&... _Args2) noexcept(
noexcept(_Invoker1<_Callable, _Ty1>::_Call(
static_cast<_Callable&&>(_Obj), static_cast<_Ty1&&>(_Arg1), static_cast<_Types2&&>(_Args2)...)))
-> decltype(_Invoker1<_Callable, _Ty1>::_Call(
Expand Down
6 changes: 3 additions & 3 deletions stl/inc/yvals_core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
// P0935R0 Eradicating Unnecessarily Explicit Default Constructors
// P0941R2 Feature-Test Macros
// P0972R0 noexcept For <chrono> zero(), min(), max()
// P1065R2 constexpr INVOKE
// (the std::invoke function only; other components like bind and reference_wrapper are C++20 only)
// P1164R1 Making create_directory() Intuitive
// P1165R1 Consistently Propagating Stateful Allocators In basic_string's operator+()
// P1902R1 Missing Feature-Test Macros 2017-2019
Expand Down Expand Up @@ -126,8 +128,6 @@
// P0682R1 Repairing Elementary String Conversions
// P0739R0 Improving Class Template Argument Deduction For The STL
// P0858R0 Constexpr Iterator Requirements
// P1065R2 constexpr INVOKE
// (the std::invoke function only; other components like bind and reference_wrapper are C++20 only)
// P1169R4 static operator()
// P1518R2 Stop Overconstraining Allocators In Container Deduction Guides
// P2162R2 Inheriting From variant
Expand Down Expand Up @@ -224,7 +224,7 @@
// P1032R1 Miscellaneous constexpr
// P1035R7 Input Range Adaptors
// P1065R2 constexpr INVOKE
// (except the std::invoke function which is implemented in C++17)
// (except the std::invoke function which is implemented unconditionally)
// P1085R2 Removing span Comparisons
// P1115R3 erase()/erase_if() Return size_type
// P1123R0 Atomic Compare-And-Exchange With Padding Bits For atomic_ref
Expand Down
8 changes: 2 additions & 6 deletions tests/std/tests/Dev11_0535636_functional_overhaul/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,10 +1049,9 @@ void test_reference_wrapper_invocation() {
}


// Test C++17 invoke().
#if _HAS_CXX17
// Test invoke().
constexpr bool test_invoke_constexpr() {
// MSVC implements LWG-2894 in C++17 and later
// MSVC implements LWG-2894 unconditionally
Thing thing;
auto p = &thing;

Expand All @@ -1076,13 +1075,10 @@ constexpr bool test_invoke_constexpr() {
assert(invoke(&cube_constexpr, 7) == 343);
return true;
}
#endif // _HAS_CXX17

void test_invoke() {
#if _HAS_CXX17
assert(test_invoke_constexpr());
STATIC_ASSERT(test_invoke_constexpr());
#endif // _HAS_CXX17

auto sp = make_shared<Thing>();

Expand Down