Merge branch 'boostorg:develop' into zig-pkg

kassane · Jan 26, 2024 · 35972e9 · 35972e9
2 parents 96eba0e + fc796a2
commit 35972e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/boost/fiber/detail/cpu_relax.hpp b/include/boost/fiber/detail/cpu_relax.hpp
@@ -59,7 +59,7 @@ namespace detail {
 //               processors
 // extended mnemonics (available with POWER7)
 // yield   ==   or 27, 27, 27
-# if defined(__POWERPC__) // Darwin PPC
+# if defined(__APPLE__) // Darwin PPC
 # define cpu_relax() asm volatile ("or r27,r27,r27" ::: "memory");
 # else
 # define cpu_relax() asm volatile ("or 27,27,27" ::: "memory");

diff --git a/include/boost/fiber/future/detail/shared_state.hpp b/include/boost/fiber/future/detail/shared_state.hpp
@@ -157,7 +157,7 @@ class shared_state_base {
 template< typename R >
 class shared_state : public shared_state_base {
 private:
-    typename std::aligned_storage< sizeof( R), alignof( R) >::type  storage_{};
+    alignas(alignof( R)) unsigned char storage_[sizeof( R)]{};
 
     void set_value_( R const& value, std::unique_lock< mutex > & lk) {
         BOOST_ASSERT( lk.owns_lock() );