Updated boost headers

14 files changed, 38 insertions, 12 deletions

diff --git a/contrib/src/boost/type_traits/add_reference.hpp b/contrib/src/boost/type_traits/add_reference.hpp
index 526f259..3c91415 100644
--- a/contrib/src/boost/type_traits/add_reference.hpp
+++ b/contrib/src/boost/type_traits/add_reference.hpp
@@ -49,9 +49,9 @@ template <class T> struct add_reference<T&>
 // these full specialisations are always required:
 template <> struct add_reference<void> { typedef void type; };
 #ifndef BOOST_NO_CV_VOID_SPECIALIZATIONS
-template <> struct add_reference<const void> { typedef void type; };
-template <> struct add_reference<const volatile void> { typedef void type; };
-template <> struct add_reference<volatile void> { typedef void type; };
+template <> struct add_reference<const void> { typedef const void type; };
+template <> struct add_reference<const volatile void> { typedef const volatile void type; };
+template <> struct add_reference<volatile void> { typedef volatile void type; };
 #endif
 
 } // namespace boost
diff --git a/contrib/src/boost/type_traits/has_trivial_copy.hpp b/contrib/src/boost/type_traits/has_trivial_copy.hpp
index 9d3265d..fd6ad2d 100644
--- a/contrib/src/boost/type_traits/has_trivial_copy.hpp
+++ b/contrib/src/boost/type_traits/has_trivial_copy.hpp
@@ -9,6 +9,7 @@
 #ifndef BOOST_TT_HAS_TRIVIAL_COPY_HPP_INCLUDED
 #define BOOST_TT_HAS_TRIVIAL_COPY_HPP_INCLUDED
 
+#include <cstddef> // size_t
 #include <boost/type_traits/intrinsics.hpp>
 #include <boost/type_traits/is_pod.hpp>
 #include <boost/type_traits/is_reference.hpp>
diff --git a/contrib/src/boost/type_traits/has_trivial_destructor.hpp b/contrib/src/boost/type_traits/has_trivial_destructor.hpp
index 763283d..9a3a61f 100644
--- a/contrib/src/boost/type_traits/has_trivial_destructor.hpp
+++ b/contrib/src/boost/type_traits/has_trivial_destructor.hpp
@@ -21,7 +21,7 @@
 #include <boost/type_traits/is_same.hpp>
 #endif
 
-#if defined(__GNUC__) || defined(__clang) || defined(__SUNPRO_CC)
+#if defined(__GNUC__) || defined(__clang__) || defined(__SUNPRO_CC)
 #include <boost/type_traits/is_destructible.hpp>
 #endif
 
diff --git a/contrib/src/boost/type_traits/is_abstract.hpp b/contrib/src/boost/type_traits/is_abstract.hpp
index 7715c5c..781d94a 100644
--- a/contrib/src/boost/type_traits/is_abstract.hpp
+++ b/contrib/src/boost/type_traits/is_abstract.hpp
@@ -48,6 +48,7 @@
 //              to degrade gracefully, rather than trash the compiler (John Maddock).
 //
 
+#include <cstddef> // size_t
 #include <boost/type_traits/intrinsics.hpp>
 #include <boost/type_traits/integral_constant.hpp>
 #ifndef BOOST_IS_ABSTRACT
diff --git a/contrib/src/boost/type_traits/is_array.hpp b/contrib/src/boost/type_traits/is_array.hpp
index 497dc49..53e1613 100644
--- a/contrib/src/boost/type_traits/is_array.hpp
+++ b/contrib/src/boost/type_traits/is_array.hpp
@@ -15,7 +15,7 @@
 #define BOOST_TT_IS_ARRAY_HPP_INCLUDED
 
 #include <boost/type_traits/integral_constant.hpp>
-#include <cstddef>
+#include <cstddef> // size_t
 
 namespace boost {
 
diff --git a/contrib/src/boost/type_traits/is_const.hpp b/contrib/src/boost/type_traits/is_const.hpp
index d9dd2aa..e0ed88a 100644
--- a/contrib/src/boost/type_traits/is_const.hpp
+++ b/contrib/src/boost/type_traits/is_const.hpp
@@ -21,6 +21,7 @@
 #ifndef BOOST_TT_IS_CONST_HPP_INCLUDED
 #define BOOST_TT_IS_CONST_HPP_INCLUDED
 
+#include <cstddef> // size_t
 #include <boost/type_traits/integral_constant.hpp>
 
 namespace boost {
@@ -35,7 +36,7 @@ namespace boost {
    template <class T>
    struct is_const : public false_type {};
    template <class T> struct is_const<T const> : public true_type{};
-   template <class T, size_t N> struct is_const<T const[N]> : public true_type{};
+   template <class T, std::size_t N> struct is_const<T const[N]> : public true_type{};
    template <class T> struct is_const<T const[]> : public true_type{};
 
 #endif
diff --git a/contrib/src/boost/type_traits/is_default_constructible.hpp b/contrib/src/boost/type_traits/is_default_constructible.hpp
index 7fd63f8..fa5d76a 100644
--- a/contrib/src/boost/type_traits/is_default_constructible.hpp
+++ b/contrib/src/boost/type_traits/is_default_constructible.hpp
@@ -9,9 +9,14 @@
 #ifndef BOOST_TT_IS_DEFAULT_CONSTRUCTIBLE_HPP_INCLUDED
 #define BOOST_TT_IS_DEFAULT_CONSTRUCTIBLE_HPP_INCLUDED
 
+#include <cstddef> // size_t
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/detail/workaround.hpp>
 
+#if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700)
+#include <boost/type_traits/is_abstract.hpp>
+#endif
+
 #if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, < 1800) && !BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40500)
 
 #include <boost/type_traits/detail/yes_no_type.hpp>
@@ -28,10 +33,25 @@ namespace boost{
          template<typename>
          static boost::type_traits::no_type test(...);
       };
-
+#if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700)
+      template<class T, bool b> 
+      struct is_default_constructible_abstract_filter
+      {
+          static const bool value = sizeof(is_default_constructible_imp::test<T>(0)) == sizeof(boost::type_traits::yes_type);
+      };
+      template<class T> 
+      struct is_default_constructible_abstract_filter<T, true>
+      {
+          static const bool value = false;
+      };
+#endif
    }
 
+#if BOOST_WORKAROUND(BOOST_GCC_VERSION, < 40700)
+   template <class T> struct is_default_constructible : public integral_constant<bool, detail::is_default_constructible_abstract_filter<T, boost::is_abstract<T>::value>::value>{};
+#else
    template <class T> struct is_default_constructible : public integral_constant<bool, sizeof(detail::is_default_constructible_imp::test<T>(0)) == sizeof(boost::type_traits::yes_type)>{};
+#endif
    template <class T, std::size_t N> struct is_default_constructible<T[N]> : public is_default_constructible<T>{};
    template <class T> struct is_default_constructible<T[]> : public is_default_constructible<T>{};
    template <class T> struct is_default_constructible<T&> : public integral_constant<bool, false>{};
diff --git a/contrib/src/boost/type_traits/is_destructible.hpp b/contrib/src/boost/type_traits/is_destructible.hpp
index 9f1e5d9..742d990 100644
--- a/contrib/src/boost/type_traits/is_destructible.hpp
+++ b/contrib/src/boost/type_traits/is_destructible.hpp
@@ -9,6 +9,7 @@
 #ifndef BOOST_TT_IS_DESTRUCTIBLE_HPP_INCLUDED
 #define BOOST_TT_IS_DESTRUCTIBLE_HPP_INCLUDED
 
+#include <cstddef> // size_t
 #include <boost/type_traits/integral_constant.hpp>
 #include <boost/detail/workaround.hpp>
 
diff --git a/contrib/src/boost/type_traits/is_pod.hpp b/contrib/src/boost/type_traits/is_pod.hpp
index 9204c93..9bd1962 100644
--- a/contrib/src/boost/type_traits/is_pod.hpp
+++ b/contrib/src/boost/type_traits/is_pod.hpp
@@ -9,6 +9,7 @@
 #ifndef BOOST_TT_IS_POD_HPP_INCLUDED
 #define BOOST_TT_IS_POD_HPP_INCLUDED
 
+#include <cstddef> // size_t
 #include <boost/type_traits/detail/config.hpp>
 #include <boost/type_traits/is_void.hpp>
 #include <boost/type_traits/is_scalar.hpp>
diff --git a/contrib/src/boost/type_traits/is_volatile.hpp b/contrib/src/boost/type_traits/is_volatile.hpp
index cefe987..5b8e716 100644
--- a/contrib/src/boost/type_traits/is_volatile.hpp
+++ b/contrib/src/boost/type_traits/is_volatile.hpp
@@ -21,6 +21,7 @@
 #ifndef BOOST_TT_IS_VOLATILE_HPP_INCLUDED
 #define BOOST_TT_IS_VOLATILE_HPP_INCLUDED
 
+#include <cstddef> // size_t
 #include <boost/type_traits/integral_constant.hpp>
 
 namespace boost {
@@ -35,7 +36,7 @@ namespace boost {
    template <class T>
    struct is_volatile : public false_type {};
    template <class T> struct is_volatile<T volatile> : public true_type{};
-   template <class T, size_t N> struct is_volatile<T volatile[N]> : public true_type{};
+   template <class T, std::size_t N> struct is_volatile<T volatile[N]> : public true_type{};
    template <class T> struct is_volatile<T volatile[]> : public true_type{};
 
 #endif
diff --git a/contrib/src/boost/type_traits/remove_const.hpp b/contrib/src/boost/type_traits/remove_const.hpp
index b47f851..e238962 100644
--- a/contrib/src/boost/type_traits/remove_const.hpp
+++ b/contrib/src/boost/type_traits/remove_const.hpp
@@ -12,7 +12,7 @@
 #define BOOST_TT_REMOVE_CONST_HPP_INCLUDED
 
 #include <boost/config.hpp>
-#include <cstddef>
+#include <cstddef> // size_t
 #include <boost/detail/workaround.hpp>
 
 namespace boost {
diff --git a/contrib/src/boost/type_traits/remove_cv.hpp b/contrib/src/boost/type_traits/remove_cv.hpp
index b50607f..08393cf 100644
--- a/contrib/src/boost/type_traits/remove_cv.hpp
+++ b/contrib/src/boost/type_traits/remove_cv.hpp
@@ -13,7 +13,7 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#include <cstddef>
+#include <cstddef> // size_t
 
 namespace boost {
 
diff --git a/contrib/src/boost/type_traits/remove_pointer.hpp b/contrib/src/boost/type_traits/remove_pointer.hpp
index fb79e59..9216652 100644
--- a/contrib/src/boost/type_traits/remove_pointer.hpp
+++ b/contrib/src/boost/type_traits/remove_pointer.hpp
@@ -18,7 +18,7 @@
 
 namespace boost {
 
-#ifdef BOOST_MSVC
+#if BOOST_WORKAROUND(BOOST_MSVC, < 1900)
 
 namespace detail{
 
diff --git a/contrib/src/boost/type_traits/type_with_alignment.hpp b/contrib/src/boost/type_traits/type_with_alignment.hpp
index ffa054a..ddf1d98 100644
--- a/contrib/src/boost/type_traits/type_with_alignment.hpp
+++ b/contrib/src/boost/type_traits/type_with_alignment.hpp
@@ -12,7 +12,7 @@
 #include <boost/type_traits/is_pod.hpp>
 #include <boost/static_assert.hpp>
 #include <boost/config.hpp>
-#include <cstddef>
+#include <cstddef> // size_t
 #include <boost/detail/workaround.hpp>
 
 #ifdef BOOST_MSVC