5 files changed, 7 insertions, 9 deletions
diff --git a/boost/align/detail/align.hpp b/boost/align/detail/align.hpp
index a58dcea747..905940ad77 100644
--- a/boost/align/detail/align.hpp
+++ b/boost/align/detail/align.hpp
@@ -20,8 +20,8 @@ align(std::size_t alignment, std::size_t size, void*& ptr,
 {
     BOOST_ASSERT(detail::is_alignment(alignment));
     if (size <= space) {
-        char* p = reinterpret_cast<char*>((reinterpret_cast<std::
-            size_t>(ptr) + alignment - 1) & ~(alignment - 1));
+        char* p = reinterpret_cast<char*>(~(alignment - 1) &
+            (reinterpret_cast<std::size_t>(ptr) + alignment - 1));
         std::size_t n = space - (p - static_cast<char*>(ptr));
         if (size <= n) {
             ptr = p;
diff --git a/boost/align/detail/align_down.hpp b/boost/align/detail/align_down.hpp
index 9a8c358c41..de3c80d06d 100644
--- a/boost/align/detail/align_down.hpp
+++ b/boost/align/detail/align_down.hpp
@@ -18,8 +18,8 @@ inline void*
 align_down(void* ptr, std::size_t alignment) BOOST_NOEXCEPT
 {
     BOOST_ASSERT(detail::is_alignment(alignment));
-    return reinterpret_cast<void*>(reinterpret_cast<std::
-        size_t>(ptr) & ~(alignment - 1));
+    return reinterpret_cast<void*>(~(alignment - 1) &
+        reinterpret_cast<std::size_t>(ptr));
 }
 
 } /* alignment */
diff --git a/boost/align/detail/align_up.hpp b/boost/align/detail/align_up.hpp
index 86686da6ae..ac11f8964f 100644
--- a/boost/align/detail/align_up.hpp
+++ b/boost/align/detail/align_up.hpp
@@ -18,8 +18,8 @@ inline void*
 align_up(void* ptr, std::size_t alignment) BOOST_NOEXCEPT
 {
     BOOST_ASSERT(detail::is_alignment(alignment));
-    return reinterpret_cast<void*>((reinterpret_cast<std::
-        size_t>(ptr) + alignment - 1) & ~(alignment - 1));
+    return reinterpret_cast<void*>(~(alignment - 1) &
+        (reinterpret_cast<std::size_t>(ptr) + alignment - 1));
 }
 
 } /* alignment */
diff --git a/boost/align/detail/alignment_of_msvc.hpp b/boost/align/detail/alignment_of_msvc.hpp
index 1526c7c296..440b840db4 100644
--- a/boost/align/detail/alignment_of_msvc.hpp
+++ b/boost/align/detail/alignment_of_msvc.hpp
@@ -23,8 +23,7 @@ struct offset_value {
 
 template<class T>
 struct alignment_of
-    : min_size<sizeof(T),
-        sizeof(offset_value<T>) - (sizeof(T) << 1)> { };
+    : min_size<sizeof(T), sizeof(offset_value<T>) - (sizeof(T) << 1)> { };
 
 } /* detail */
 } /* alignment */
diff --git a/boost/align/detail/is_alignment.hpp b/boost/align/detail/is_alignment.hpp
index 8bedba19c3..542fbe4694 100644
--- a/boost/align/detail/is_alignment.hpp
+++ b/boost/align/detail/is_alignment.hpp
@@ -4,7 +4,6 @@ Copyright 2014 Glen Joseph Fernandes
 
 Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
-
 */
 #ifndef BOOST_ALIGN_DETAIL_IS_ALIGNMENT_HPP
 #define BOOST_ALIGN_DETAIL_IS_ALIGNMENT_HPP