Skip to content

fix: remove static from header-inline helpers for C++20 module compatibility #460

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
cameron314 merged 1 commit into from
Oct 26, 2026
Merged

fix: remove static from header-inline helpers for C++20 module compatibility #460

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
14 changes: 7 additions & 7 deletions concurrentqueue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ namespace details
};
template<std::size_t size> struct hash_32_or_64 : public _hash_32_or_64<(size > 4)> { };

static inline size_t hash_thread_id(thread_id_t id)
inline size_t hash_thread_id(thread_id_t id)
{
static_assert(sizeof(thread_id_t) <= 8, "Expected a platform where thread IDs are at most 64-bit values");
#if defined(__GNUC__) && !defined(__clang__)
Expand All @@ -494,7 +494,7 @@ namespace details
}

template<typename T>
static inline bool circular_less_than(T a, T b)
inline bool circular_less_than(T a, T b)
{
static_assert(std::is_integral<T>::value && !std::numeric_limits<T>::is_signed, "circular_less_than is intended to be used only with unsigned integer types");
return static_cast<T>(a - b) > static_cast<T>(static_cast<T>(1) << (static_cast<T>(sizeof(T) * CHAR_BIT - 1)));
Expand All @@ -503,14 +503,14 @@ namespace details
}

template<typename U>
static inline char* align_for(char* ptr)
inline char* align_for(char* ptr)
{
const std::size_t alignment = std::alignment_of<U>::value;
return ptr + (alignment - (reinterpret_cast<std::uintptr_t>(ptr) % alignment)) % alignment;
}

template<typename T>
static inline T ceil_to_pow_2(T x)
inline T ceil_to_pow_2(T x)
{
static_assert(std::is_integral<T>::value && !std::numeric_limits<T>::is_signed, "ceil_to_pow_2 is intended to be used only with unsigned integer types");

Expand All @@ -527,15 +527,15 @@ namespace details
}

template<typename T>
static inline void swap_relaxed(std::atomic<T>& left, std::atomic<T>& right)
inline void swap_relaxed(std::atomic<T>& left, std::atomic<T>& right)
{
T temp = left.load(std::memory_order_relaxed);
left.store(right.load(std::memory_order_relaxed), std::memory_order_relaxed);
right.store(temp, std::memory_order_relaxed);
}

template<typename T>
static inline T const& nomove(T const& x)
inline T const& nomove(T const& x)
{
return x;
}
Expand All @@ -562,7 +562,7 @@ namespace details
};

template<typename It>
static inline auto deref_noexcept(It& it) MOODYCAMEL_NOEXCEPT -> decltype(*it)
inline auto deref_noexcept(It& it) MOODYCAMEL_NOEXCEPT -> decltype(*it)
{
return *it;
}
Expand Down
Loading