From 269d7452b15127996b7dd7862f4db524f2c576f0 Mon Sep 17 00:00:00 2001
From: John Maddock
Date: Sat, 7 Jan 2012 17:18:00 +0000
Subject: [PATCH] Merge type_traits changes from Trunk.
[SVN r76338]
---
doc/html/index.html | 4 ++--
doc/html/index/s11.html | 2 +-
doc/html/index/s12.html | 2 +-
doc/html/index/s13.html | 2 +-
doc/html/index/s14.html | 2 +-
include/boost/type_traits/type_with_alignment.hpp | 6 ++++++
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/doc/html/index.html b/doc/html/index.html
index 65a57e7..87d3803 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -31,7 +31,7 @@
Ottosen, Roman Perepelitsa, Robert Ramey, Jeremy Siek, Robert Stewart and Steven
Watanabe
-Last revised: October 10, 2011 at 00:28:33 +0200 |
+Last revised: October 07, 2011 at 23:05:54 +0200 |
|
diff --git a/doc/html/index/s11.html b/doc/html/index/s11.html
index 7ab2bb3..685ba2b 100644
--- a/doc/html/index/s11.html
+++ b/doc/html/index/s11.html
@@ -24,7 +24,7 @@
A C D E F H I M N O P R T
-
diff --git a/doc/html/index/s12.html b/doc/html/index/s12.html
index 8fcfd25..c5d4ee7 100644
--- a/doc/html/index/s12.html
+++ b/doc/html/index/s12.html
@@ -24,7 +24,7 @@
F R T
-
diff --git a/doc/html/index/s13.html b/doc/html/index/s13.html
index da248e8..431b2ce 100644
--- a/doc/html/index/s13.html
+++ b/doc/html/index/s13.html
@@ -24,7 +24,7 @@
B
-
diff --git a/doc/html/index/s14.html b/doc/html/index/s14.html
index f60fcb3..b5a0eac 100644
--- a/doc/html/index/s14.html
+++ b/doc/html/index/s14.html
@@ -23,7 +23,7 @@
A B C D E F H I M N O P R T U
-
diff --git a/include/boost/type_traits/type_with_alignment.hpp b/include/boost/type_traits/type_with_alignment.hpp
index 5de3bce..a86137f 100644
--- a/include/boost/type_traits/type_with_alignment.hpp
+++ b/include/boost/type_traits/type_with_alignment.hpp
@@ -225,6 +225,8 @@ struct __attribute__((__aligned__(4))) a4 {};
struct __attribute__((__aligned__(8))) a8 {};
struct __attribute__((__aligned__(16))) a16 {};
struct __attribute__((__aligned__(32))) a32 {};
+struct __attribute__((__aligned__(64))) a64 {};
+struct __attribute__((__aligned__(128))) a128 {};
}
template<> class type_with_alignment<1> { public: typedef char type; };
@@ -233,6 +235,8 @@ template<> class type_with_alignment<4> { public: typedef align::a4 type; };
template<> class type_with_alignment<8> { public: typedef align::a8 type; };
template<> class type_with_alignment<16> { public: typedef align::a16 type; };
template<> class type_with_alignment<32> { public: typedef align::a32 type; };
+template<> class type_with_alignment<64> { public: typedef align::a64 type; };
+template<> class type_with_alignment<128> { public: typedef align::a128 type; };
namespace detail {
BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a2,true)
@@ -240,6 +244,8 @@ BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a4,true)
BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a8,true)
BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a16,true)
BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a32,true)
+BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a64,true)
+BOOST_TT_AUX_BOOL_TRAIT_IMPL_SPEC1(is_pod,::boost::align::a128,true)
}
#endif
#if (defined(BOOST_MSVC) || (defined(BOOST_INTEL) && defined(_MSC_VER))) && _MSC_VER >= 1300