Skip to content

cleanups #136

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
timblechmann merged 3 commits into from
May 22, 2026
+16 −8
Merged

cleanups #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
deabcdd
atomic: remove consume / add acq_rel wrapper
timblechmann May 22, 2026
e3ed20e
stack/spsc_queue - don't include copy_payload
timblechmann May 22, 2026
38ef540
cleanup: fix use concepts / enablers
timblechmann May 22, 2026
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
6 changes: 3 additions & 3 deletions include/boost/lockfree/detail/atomic.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@ namespace detail {

#if defined( BOOST_LOCKFREE_FORCE_BOOST_ATOMIC )
using boost::atomic;
using boost::memory_order_acq_rel;
using boost::memory_order_acquire;
using boost::memory_order_consume;
using boost::memory_order_relaxed;
using boost::memory_order_release;
#else
using std::atomic;
using std::memory_order_acq_rel;
using std::memory_order_acquire;
using std::memory_order_consume;
using std::memory_order_relaxed;
using std::memory_order_release;
#endif

} // namespace detail
using detail::atomic;
using detail::memory_order_acq_rel;
using detail::memory_order_acquire;
using detail::memory_order_consume;
using detail::memory_order_relaxed;
using detail::memory_order_release;

Expand Down
10 changes: 10 additions & 0 deletions include/boost/lockfree/queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,12 @@ class queue
*
* \note Thread-safe and non-blocking. Might modify return argument even if operation fails.
* */
#if !defined( BOOST_NO_CXX20_HDR_CONCEPTS )
template < typename U >
requires( std::is_constructible_v< U, T && > )
#else
template < typename U, typename Enabler = std::enable_if_t< std::is_constructible< U, T&& >::value > >
#endif
bool pop( U& ret )
{
for ( ;; ) {
Expand Down Expand Up @@ -569,7 +574,12 @@ class queue
* \note Not thread-safe, but non-blocking. Might modify return argument even if operation fails.
*
* */
#if !defined( BOOST_NO_CXX20_HDR_CONCEPTS )
template < typename U >
requires( std::is_constructible_v< U, T && > )
#else
template < typename U, typename Enabler = std::enable_if_t< std::is_constructible< U, T&& >::value > >
#endif
bool unsynchronized_pop( U& ret )
{
for ( ;; ) {
Expand Down
3 changes: 1 addition & 2 deletions include/boost/lockfree/spsc_queue.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include <boost/static_assert.hpp>

#include <boost/lockfree/detail/atomic.hpp>
#include <boost/lockfree/detail/copy_payload.hpp>
#include <boost/lockfree/detail/parameter.hpp>
#include <boost/lockfree/detail/prefix.hpp>
#include <boost/lockfree/detail/uses_optional.hpp>
Expand Down Expand Up @@ -768,7 +767,7 @@ class spsc_queue : public detail::make_ringbuffer< T, Options... >::ringbuffer_t
template < typename U >
requires( std::is_convertible_v< T, U > )
#else
template < typename U, typename Enabler = std::enable_if< std::is_convertible< T, U >::value > >
template < typename U, typename Enabler = std::enable_if_t< std::is_convertible< T, U >::value > >
#endif
bool pop( U& ret )
{
Expand Down
5 changes: 2 additions & 3 deletions include/boost/lockfree/stack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <boost/static_assert.hpp>

#include <boost/lockfree/detail/atomic.hpp>
#include <boost/lockfree/detail/copy_payload.hpp>
#include <boost/lockfree/detail/freelist.hpp>
#include <boost/lockfree/detail/parameter.hpp>
#include <boost/lockfree/detail/tagged_ptr.hpp>
Expand Down Expand Up @@ -589,7 +588,7 @@ class stack
template < typename U >
requires( std::is_convertible_v< T, U > )
#else
template < typename U, typename Enabler = std::enable_if< std::is_convertible< T, U >::value > >
template < typename U, typename Enabler = std::enable_if_t< std::is_convertible< T, U >::value > >
#endif
bool pop( U& ret )
{
Expand Down Expand Up @@ -660,7 +659,7 @@ class stack
template < typename U >
requires( std::is_convertible_v< T, U > )
#else
template < typename U, typename Enabler = std::enable_if< std::is_convertible< T, U >::value > >
template < typename U, typename Enabler = std::enable_if_t< std::is_convertible< T, U >::value > >
#endif
bool unsynchronized_pop( U& ret )
{
Expand Down