Update GCC implementation of assume_aligned

Allow use with pointer types other than void pointers.
Elzair · Feb 7, 2016 · df0e5ea · df0e5ea
1 parent 1f82968
commit df0e5ea
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/include/boost/align/detail/assume_aligned.hpp b/include/boost/align/detail/assume_aligned.hpp
@@ -12,6 +12,6 @@ License, Version 1.0.
 #ifndef BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_HPP
 #define BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_HPP
 
-#define BOOST_ALIGN_ASSUME_ALIGNED(ptr, alignment)
+#define BOOST_ALIGN_ASSUME_ALIGNED(p, n)
 
 #endif
diff --git a/include/boost/align/detail/assume_aligned_clang.hpp b/include/boost/align/detail/assume_aligned_clang.hpp
@@ -10,10 +10,10 @@ License, Version 1.0.
 #define BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_CLANG_HPP
 
 #if __has_builtin(__builtin_assume_aligned)
-#define BOOST_ALIGN_ASSUME_ALIGNED(ptr, alignment) \
-(ptr) = __builtin_assume_aligned((ptr), (alignment))
+#define BOOST_ALIGN_ASSUME_ALIGNED(p, n) \
+(ptr) = __builtin_assume_aligned((p), (n))
 #else
-#define BOOST_ALIGN_ASSUME_ALIGNED(ptr, alignment)
+#define BOOST_ALIGN_ASSUME_ALIGNED(p, n)
 #endif
 
 #endif
diff --git a/include/boost/align/detail/assume_aligned_gcc.hpp b/include/boost/align/detail/assume_aligned_gcc.hpp
@@ -12,7 +12,7 @@ License, Version 1.0.
 #ifndef BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_GCC_HPP
 #define BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_GCC_HPP
 
-#define BOOST_ALIGN_ASSUME_ALIGNED(ptr, alignment) \
-(ptr) = __builtin_assume_aligned((ptr), (alignment))
+#define BOOST_ALIGN_ASSUME_ALIGNED(p, n) \
+(p) = static_cast<typeof(p)>(__builtin_assume_aligned((p), (n)))
 
 #endif
diff --git a/include/boost/align/detail/assume_aligned_intel.hpp b/include/boost/align/detail/assume_aligned_intel.hpp
@@ -12,7 +12,7 @@ License, Version 1.0.
 #ifndef BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_INTEL_HPP
 #define BOOST_ALIGN_DETAIL_ASSUME_ALIGNED_INTEL_HPP
 
-#define BOOST_ALIGN_ASSUME_ALIGNED(ptr, alignment) \
-__assume_aligned((ptr), (alignment))
+#define BOOST_ALIGN_ASSUME_ALIGNED(p, n) \
+__assume_aligned((p), (n))
 
 #endif
diff --git a/include/boost/align/detail/assume_aligned_msvc.hpp b/include/boost/align/detail/assume_aligned_msvc.hpp
@@ -14,7 +14,7 @@ License, Version 1.0.
 
 #include <cstddef>
 
-#define BOOST_ALIGN_ASSUME_ALIGNED(ptr, alignment) \
-__assume((reinterpret_cast<std::size_t>(ptr) & ((alignment) - 1)) == 0)
+#define BOOST_ALIGN_ASSUME_ALIGNED(p, n) \
+__assume((reinterpret_cast<std::size_t>(p) & ((n) - 1)) == 0)
 
 #endif