passenger 6.0.7 → 6.0.8

data/src/cxx_supportlib/vendor-modified/boost/atomic/detail/extra_ops_gcc_ppc.hpp

@@ -17,11 +17,12 @@
 #include <cstddef>
 #include <boost/memory_order.hpp>
 #include <boost/atomic/detail/config.hpp>
-#include <boost/atomic/detail/storage_type.hpp>
+#include <boost/atomic/detail/storage_traits.hpp>
 #include <boost/atomic/detail/extra_operations_fwd.hpp>
 #include <boost/atomic/detail/extra_ops_generic.hpp>
 #include <boost/atomic/detail/ops_gcc_ppc_common.hpp>
-#include <boost/atomic/capabilities.hpp>
+#include <boost/atomic/detail/capabilities.hpp>
+#include <boost/atomic/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
@@ -32,7 +33,7 @@ namespace atomics {
 namespace detail {
 
 template< typename Base >
-struct gcc_ppc_extra_operations_common :
+struct extra_operations_gcc_ppc_common :
     public Base
 {
     typedef Base base_type;
@@ -85,20 +86,20 @@ struct gcc_ppc_extra_operations_common :
 };
 
 template< typename Base, std::size_t Size, bool Signed >
-struct gcc_ppc_extra_operations;
+struct extra_operations_gcc_ppc;
 
 #if defined(BOOST_ATOMIC_DETAIL_PPC_HAS_LBARX_STBCX)
 
 template< typename Base, bool Signed >
-struct gcc_ppc_extra_operations< Base, 1u, Signed > :
-    public generic_extra_operations< Base, 1u, Signed >
+struct extra_operations_gcc_ppc< Base, 1u, Signed > :
+    public extra_operations_generic< Base, 1u, Signed >
 {
-    typedef generic_extra_operations< Base, 1u, Signed > base_type;
+    typedef extra_operations_generic< Base, 1u, Signed > base_type;
     typedef typename base_type::storage_type storage_type;
 
     static BOOST_FORCEINLINE storage_type fetch_negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -111,13 +112,13 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -130,14 +131,14 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type add(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -149,14 +150,14 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type sub(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -168,14 +169,14 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_and(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -187,14 +188,14 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_or(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -206,14 +207,14 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_xor(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -225,13 +226,13 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type fetch_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -244,13 +245,13 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -263,14 +264,14 @@ struct gcc_ppc_extra_operations< Base, 1u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 };
 
 template< typename Base, bool Signed >
 struct extra_operations< Base, 1u, Signed, true > :
-    public gcc_ppc_extra_operations_common< gcc_ppc_extra_operations< Base, 1u, Signed > >
+    public extra_operations_gcc_ppc_common< extra_operations_gcc_ppc< Base, 1u, Signed > >
 {
 };
 
@@ -279,15 +280,15 @@ struct extra_operations< Base, 1u, Signed, true > :
 #if defined(BOOST_ATOMIC_DETAIL_PPC_HAS_LHARX_STHCX)
 
 template< typename Base, bool Signed >
-struct gcc_ppc_extra_operations< Base, 2u, Signed > :
-    public generic_extra_operations< Base, 2u, Signed >
+struct extra_operations_gcc_ppc< Base, 2u, Signed > :
+    public extra_operations_generic< Base, 2u, Signed >
 {
-    typedef generic_extra_operations< Base, 2u, Signed > base_type;
+    typedef extra_operations_generic< Base, 2u, Signed > base_type;
     typedef typename base_type::storage_type storage_type;
 
     static BOOST_FORCEINLINE storage_type fetch_negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -300,13 +301,13 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -319,14 +320,14 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type add(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -338,14 +339,14 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type sub(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -357,14 +358,14 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_and(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -376,14 +377,14 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_or(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -395,14 +396,14 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_xor(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -414,13 +415,13 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type fetch_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -433,13 +434,13 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -452,7 +453,7 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 };
@@ -460,15 +461,15 @@ struct gcc_ppc_extra_operations< Base, 2u, Signed > :
 #endif // defined(BOOST_ATOMIC_DETAIL_PPC_HAS_LHARX_STHCX)
 
 template< typename Base, bool Signed >
-struct gcc_ppc_extra_operations< Base, 4u, Signed > :
-    public generic_extra_operations< Base, 4u, Signed >
+struct extra_operations_gcc_ppc< Base, 4u, Signed > :
+    public extra_operations_generic< Base, 4u, Signed >
 {
-    typedef generic_extra_operations< Base, 4u, Signed > base_type;
+    typedef extra_operations_generic< Base, 4u, Signed > base_type;
     typedef typename base_type::storage_type storage_type;
 
     static BOOST_FORCEINLINE storage_type fetch_negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -481,13 +482,13 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -500,14 +501,14 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type add(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -519,14 +520,14 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type sub(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -538,14 +539,14 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_and(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -557,14 +558,14 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_or(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -576,14 +577,14 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_xor(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -595,13 +596,13 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type fetch_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -614,13 +615,13 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -633,29 +634,29 @@ struct gcc_ppc_extra_operations< Base, 4u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 };
 
 template< typename Base, bool Signed >
 struct extra_operations< Base, 4u, Signed, true > :
-    public gcc_ppc_extra_operations_common< gcc_ppc_extra_operations< Base, 4u, Signed > >
+    public extra_operations_gcc_ppc_common< extra_operations_gcc_ppc< Base, 4u, Signed > >
 {
 };
 
 #if defined(BOOST_ATOMIC_DETAIL_PPC_HAS_LDARX_STDCX)
 
 template< typename Base, bool Signed >
-struct gcc_ppc_extra_operations< Base, 8u, Signed > :
-    public generic_extra_operations< Base, 8u, Signed >
+struct extra_operations_gcc_ppc< Base, 8u, Signed > :
+    public extra_operations_generic< Base, 8u, Signed >
 {
-    typedef generic_extra_operations< Base, 8u, Signed > base_type;
+    typedef extra_operations_generic< Base, 8u, Signed > base_type;
     typedef typename base_type::storage_type storage_type;
 
     static BOOST_FORCEINLINE storage_type fetch_negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -668,13 +669,13 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type negate(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -687,14 +688,14 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type add(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -706,14 +707,14 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type sub(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -725,14 +726,14 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_and(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -744,14 +745,14 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_or(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -763,14 +764,14 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_xor(storage_type volatile& storage, storage_type v, memory_order order) BOOST_NOEXCEPT
     {
         storage_type original, result;
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         __asm__ __volatile__
         (
             "1:\n\t"
@@ -782,13 +783,13 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             : "b" (v)
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 
     static BOOST_FORCEINLINE storage_type fetch_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -801,13 +802,13 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return original;
     }
 
     static BOOST_FORCEINLINE storage_type bitwise_complement(storage_type volatile& storage, memory_order order) BOOST_NOEXCEPT
     {
-        gcc_ppc_operations_base::fence_before(order);
+        core_arch_operations_gcc_ppc_base::fence_before(order);
         storage_type original, result;
         __asm__ __volatile__
         (
@@ -820,14 +821,14 @@ struct gcc_ppc_extra_operations< Base, 8u, Signed > :
             :
             : BOOST_ATOMIC_DETAIL_ASM_CLOBBER_CC
         );
-        gcc_ppc_operations_base::fence_after(order);
+        core_arch_operations_gcc_ppc_base::fence_after(order);
         return result;
     }
 };
 
 template< typename Base, bool Signed >
 struct extra_operations< Base, 8u, Signed, true > :
-    public gcc_ppc_extra_operations_common< gcc_ppc_extra_operations< Base, 8u, Signed > >
+    public extra_operations_gcc_ppc_common< extra_operations_gcc_ppc< Base, 8u, Signed > >
 {
 };
 
@@ -837,4 +838,6 @@ struct extra_operations< Base, 8u, Signed, true > :
 } // namespace atomics
 } // namespace boost
 
+#include <boost/atomic/detail/footer.hpp>
+
 #endif // BOOST_ATOMIC_DETAIL_EXTRA_OPS_GCC_ARM_PPC_INCLUDED_