Skip to content

fix: add inline to constexpr vars and extern C to _mm_pause for C++ module compat #2030

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

Open
guptapratykshh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: add inline to constexpr vars and extern C to _mm_pause for C++ module compat #2030

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
4 changes: 2 additions & 2 deletions include/stdexec/__detail/__any.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ namespace STDEXEC::__any
//! 4. @c Interface<...Bases...<__value_proxy_root<Interface>>...>
//! 5. @c Interface<...Bases...<__reference_proxy_root<Interface>>...>

constexpr size_t __default_buffer_size = 3 * sizeof(void *);
constexpr char const *__pure_virt_msg = "internal error: pure virtual %s() called\n";
inline constexpr size_t __default_buffer_size = 3 * sizeof(void *);
inline constexpr char const *__pure_virt_msg = "internal error: pure virtual %s() called\n";

//////////////////////////////////////////////////////////////////////////////////////////
// forward declarations
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ namespace STDEXEC
namespace STDEXEC
{
// Used by the STDEXEC_CATCH macro to provide a stub initialization of the exception object.
constexpr struct __catch_any_lvalue_t
inline constexpr struct __catch_any_lvalue_t
{
template <class _Tp>
STDEXEC_ATTRIBUTE(host, device)
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__let.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ namespace STDEXEC
return STDEXEC::__invoke(static_cast<_Fun&&>(__fn), __args...);
};

constexpr auto __start_next_fn =
inline constexpr auto __start_next_fn =
[]<class _Fun, class _Receiver, class _Env2, class _Storage, class _Tuple>(
_Fun& __fn,
_Receiver& __rcvr,
Expand Down
4 changes: 2 additions & 2 deletions include/stdexec/__detail/__meta.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,8 +899,8 @@ namespace STDEXEC
{};
};

constexpr char __type_name_prefix[] = "__xyzzy<";
constexpr char __type_name_suffix[] = ">::__plugh";
inline constexpr char __type_name_prefix[] = "__xyzzy<";
inline constexpr char __type_name_suffix[] = ">::__plugh";

[[nodiscard]]
consteval std::string_view __find_pretty_name(std::string_view __sv) noexcept
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__query.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace STDEXEC
using __member_query_result_t = decltype(__declval<_Env const &>().query(__declval<_Qy const &>(),
__declval<_Args>()...));

constexpr __none_such __no_default{};
inline constexpr __none_such __no_default{};

template <class _Query, class _Env, class... _Args>
concept __has_validation = requires { _Query::template __validate<_Env, _Args...>(); };
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/__detail/__utility.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ STDEXEC_PRAGMA_IGNORE_GNU("-Wduplicate-decl-specifier")

namespace STDEXEC
{
constexpr std::size_t __npos = ~0UL;
inline constexpr std::size_t __npos = ~0UL;

template <class...>
struct __undefined;
Expand Down
2 changes: 1 addition & 1 deletion include/stdexec/stop_token.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ STDEXEC_PRAGMA_PUSH()
STDEXEC_PRAGMA_IGNORE_GNU("-Warray-bounds")

#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
extern void _mm_pause();
extern "C" void _mm_pause();
#endif

namespace STDEXEC::__stok
Expand Down
Loading