update to boost 1.41.0

[lyx.git] / boost / boost / type_traits / alignment_of.hpp

diff --git a/boost/boost/type_traits/alignment_of.hpp b/boost/boost/type_traits/alignment_of.hpp
index 8672cca17ec004cc67b610b30a9f8a30cd1cea21..51357ce5608211e1d43d1e5c4e385ec530302a86 100644 (file)
--- a/boost/boost/type_traits/alignment_of.hpp
+++ b/boost/boost/type_traits/alignment_of.hpp
@@ -9,15 +9,16 @@
 #ifndef BOOST_TT_ALIGNMENT_OF_HPP_INCLUDED
 #define BOOST_TT_ALIGNMENT_OF_HPP_INCLUDED
 
-#include "boost/config.hpp"
+#include <boost/config.hpp>
 #include <cstddef>
 
+#include <boost/type_traits/intrinsics.hpp>
 // should be the last #include
-#include "boost/type_traits/detail/size_t_trait_def.hpp"
+#include <boost/type_traits/detail/size_t_trait_def.hpp>
 
 #ifdef BOOST_MSVC
 #   pragma warning(push)
-#   pragma warning(disable: 4121) // alignment is sensitive to packing
+#   pragma warning(disable: 4121 4512) // alignment is sensitive to packing
 #endif
 #if defined(__BORLANDC__) && (__BORLANDC__ < 0x600)
 #pragma option push -Vx- -Ve-
@@ -30,6 +31,10 @@ template <typename T> struct alignment_of;
 // get the alignment of some arbitrary type:
 namespace detail {
 
+#ifdef BOOST_MSVC
+#pragma warning(push)
+#pragma warning(disable:4324) // structure was padded due to __declspec(align())
+#endif
 template <typename T>
 struct alignment_of_hack
 {
@@ -37,7 +42,9 @@ struct alignment_of_hack
     T t;
     alignment_of_hack();
 };
-
+#ifdef BOOST_MSVC
+#pragma warning(pop)
+#endif
 
 template <unsigned A, unsigned S>
 struct alignment_logic
@@ -49,11 +56,32 @@ struct alignment_logic
 template< typename T >
 struct alignment_of_impl
 {
+#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1400)
+    //
+    // With MSVC both the native __alignof operator
+    // and our own logic gets things wrong from time to time :-(
+    // Using a combination of the two seems to make the most of a bad job:
+    //
     BOOST_STATIC_CONSTANT(std::size_t, value =
         (::boost::detail::alignment_logic<
-            sizeof(detail::alignment_of_hack<T>) - sizeof(T),
+            sizeof(::boost::detail::alignment_of_hack<T>) - sizeof(T),
+            __alignof(T)
+        >::value));
+#elif !defined(BOOST_ALIGNMENT_OF)
+    BOOST_STATIC_CONSTANT(std::size_t, value =
+        (::boost::detail::alignment_logic<
+            sizeof(::boost::detail::alignment_of_hack<T>) - sizeof(T),
             sizeof(T)
         >::value));
+#else
+   //
+   // We put this here, rather than in the definition of
+   // alignment_of below, because MSVC's __alignof doesn't
+   // always work in that context for some unexplained reason.
+   // (See type_with_alignment tests for test cases).
+   //
+   BOOST_STATIC_CONSTANT(std::size_t, value = BOOST_ALIGNMENT_OF(T));
+#endif
 };
 
 } // namespace detail
@@ -94,7 +122,7 @@ BOOST_TT_AUX_SIZE_T_TRAIT_SPEC1(alignment_of,void const volatile,0)
 #   pragma warning(pop)
 #endif
 
-#include "boost/type_traits/detail/size_t_trait_undef.hpp"
+#include <boost/type_traits/detail/size_t_trait_undef.hpp>
 
 #endif // BOOST_TT_ALIGNMENT_OF_HPP_INCLUDED