Ticket #10349: atomic_enum.patch

boost/atomic/detail/atomic_template.hpp

@@ -21 +21 @@
 #include <boost/assert.hpp>
 #include <boost/type_traits/is_signed.hpp>
 #include <boost/type_traits/is_integral.hpp>
+#include <boost/type_traits/is_enum.hpp>
 #include <boost/atomic/detail/config.hpp>
 #include <boost/atomic/detail/casts.hpp>
 #include <boost/atomic/detail/operations_fwd.hpp>
@@ -56 +57 @@
     return (failure_order & 15u) <= (success_order & 15u);
 }
 
-template< typename T, bool IsInt = boost::is_integral< T >::value >
-struct classify
+struct integral_type;
+struct enum_type;
+struct user_defined_type;
+struct pointer_type;
+
+template <typename T, bool bIsInt = boost::is_integral<T>::value>
+struct classify_integral_or_other
 {
-    typedef void type;
+  typedef user_defined_type type;
 };
 
 template< typename T >
-struct classify< T, true > { typedef int type; };
+struct classify_integral_or_other<T,true>
+{
+  typedef integral_type type;
+};
 
 template< typename T >
-struct classify< T*, false > { typedef void* type; };
+struct classify_integral_or_other<T*,false>
+{
+  typedef pointer_type type;
+};
 
-template< typename T, typename Kind >
+template <typename T, bool bIsEnum = boost::is_enum<T>::value>
+struct classify_enum_or_other
+{
+  typedef enum_type type;
+};
+
+template <typename T>
+struct classify_enum_or_other<T,false>
+  : public classify_integral_or_other<T>
+{};
+
+template <typename T>
+struct classify
+  : public classify_enum_or_other<T>
+{};
+
+
+template <typename T, typename Kind>
 class base_atomic;
 
+
+
+//! Implementation for enums ---> store as int
+template <typename T>
+class base_atomic<T,enum_type>
+{
+private:
+    typedef T value_type;
+    typedef T difference_type;
+    typedef atomics::detail::operations< storage_size_of<int >::value, boost::is_signed<int >::value > operations;
+
+protected:
+    typedef value_type value_arg_type;
+
+public:
+    typedef typename operations::storage_type storage_type;
+
+protected:
+    storage_type m_storage;
+
+public:
+    BOOST_DEFAULTED_FUNCTION(base_atomic(), {})
+    BOOST_CONSTEXPR explicit base_atomic(value_type v) BOOST_NOEXCEPT : m_storage(v) {}
+
+    BOOST_FORCEINLINE void store(value_type v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+    {
+        BOOST_ASSERT(order != memory_order_consume);
+        BOOST_ASSERT(order != memory_order_acquire);
+        BOOST_ASSERT(order != memory_order_acq_rel);
+
+        operations::store(m_storage, static_cast< storage_type >(v), order);
+    }
+
+    BOOST_FORCEINLINE value_type load(memory_order order = memory_order_seq_cst) const volatile BOOST_NOEXCEPT
+    {
+        BOOST_ASSERT(order != memory_order_release);
+        BOOST_ASSERT(order != memory_order_acq_rel);
+
+        return static_cast< value_type >(operations::load(m_storage, order));
+    }
+
+    BOOST_FORCEINLINE value_type exchange(value_type v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+    {
+        return static_cast< value_type >(operations::exchange(m_storage, static_cast< storage_type >(v), order));
+    }
+
+    BOOST_FORCEINLINE bool compare_exchange_strong(value_type& expected, value_type desired, memory_order success_order, memory_order failure_order) volatile BOOST_NOEXCEPT
+    {
+        BOOST_ASSERT(failure_order != memory_order_release);
+        BOOST_ASSERT(failure_order != memory_order_acq_rel);
+        BOOST_ASSERT(cas_failure_order_must_not_be_stronger_than_success_order(success_order, failure_order));
+
+        storage_type old_value = static_cast< storage_type >(expected);
+        const bool res = operations::compare_exchange_strong(m_storage, old_value, static_cast< storage_type >(desired), success_order, failure_order);
+        expected = static_cast< value_type >(old_value);
+        return res;
+    }
+
+    BOOST_FORCEINLINE bool compare_exchange_strong(value_type& expected, value_type desired, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+    {
+        return compare_exchange_strong(expected, desired, order, atomics::detail::deduce_failure_order(order));
+    }
+
+    BOOST_FORCEINLINE bool compare_exchange_weak(value_type& expected, value_type desired, memory_order success_order, memory_order failure_order) volatile BOOST_NOEXCEPT
+    {
+        BOOST_ASSERT(failure_order != memory_order_release);
+        BOOST_ASSERT(failure_order != memory_order_acq_rel);
+        BOOST_ASSERT(cas_failure_order_must_not_be_stronger_than_success_order(success_order, failure_order));
+
+        storage_type old_value = static_cast< storage_type >(expected);
+        const bool res = operations::compare_exchange_weak(m_storage, old_value, static_cast< storage_type >(desired), success_order, failure_order);
+        expected = static_cast< value_type >(old_value);
+        return res;
+    }
+
+    BOOST_FORCEINLINE bool compare_exchange_weak(value_type& expected, value_type desired, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
+    {
+        return compare_exchange_weak(expected, desired, order, atomics::detail::deduce_failure_order(order));
+    }
+
+    BOOST_FORCEINLINE bool is_lock_free() const volatile BOOST_NOEXCEPT
+    {
+        return operations::is_lock_free(m_storage);
+    }
+
+    BOOST_DELETED_FUNCTION(base_atomic(base_atomic const&))
+    BOOST_DELETED_FUNCTION(base_atomic& operator=(base_atomic const&))
+};
+
+
+
 //! Implementation for integers
-template< typename T >
-class base_atomic< T, int >
+template <typename T>
+class base_atomic<T,integral_type>
 {
 private:
     typedef T value_type;
@@ -228 +348 @@
     BOOST_DELETED_FUNCTION(base_atomic& operator=(base_atomic const&))
 };
 
+
+
 //! Implementation for bool
 template< >
-class base_atomic< bool, int >
+class base_atomic<bool,integral_type>
 {
 private:
     typedef bool value_type;
@@ -315 +437 @@
 };
 
 
-//! Implementation for user-defined types, such as structs and enums
-template< typename T >
-class base_atomic< T, void >
+
+//! Implementation for user-defined types, such as structs
+template <typename T>
+class base_atomic<T,user_defined_type>
 {
 private:
     typedef T value_type;
@@ -403 +526 @@
 };
 
 
+
 //! Implementation for pointers
-template< typename T >
-class base_atomic< T*, void* >
+template <typename T>
+class base_atomic<T*,pointer_type>
 {
 private:
     typedef T* value_type;
@@ -533 +657 @@
 };
 
 
+
 //! Implementation for void pointers
-template< >
-class base_atomic< void*, void* >
+template <>
+class base_atomic<void*,pointer_type>
 {
 private:
     typedef void* value_type;
@@ -664 +789 @@
 
 } // namespace detail
 
-template< typename T >
+
+
+template <typename T>
 class atomic :
-    public atomics::detail::base_atomic< T, typename atomics::detail::classify< T >::type >
+  public atomics::detail::base_atomic<T,typename atomics::detail::classify<T>::type>
 {
 private:
     typedef T value_type;