From 81c4b8f8604cc54d900aada88109fdf8e07653cf Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Tue, 20 Jan 2015 17:40:32 +0000 Subject: [PATCH] Fix function_types failures. --- include/boost/type_traits/config.hpp | 21 +++++++++++++++++++ .../boost/type_traits/integral_constant.hpp | 6 +++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 include/boost/type_traits/config.hpp diff --git a/include/boost/type_traits/config.hpp b/include/boost/type_traits/config.hpp new file mode 100644 index 0000000..1e00d18 --- /dev/null +++ b/include/boost/type_traits/config.hpp @@ -0,0 +1,21 @@ + +// (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000. +// Use, modification and distribution are subject to the Boost Software License, +// Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt). +// +// See http://www.boost.org/libs/type_traits for most recent version including documentation. + +#ifndef BOOST_TT_OLD_CONFIG_HPP_INCLUDED +#define BOOST_TT_OLD_CONFIG_HPP_INCLUDED + +// +// This header is deprecated and no longer used by type_traits: +// +#if defined(__GNUC__) || defined(_MSC_VER) +# pragma message("NOTE: Use of this header (ice_and.hpp) is deprecated") +#endif + +#endif // BOOST_TT_CONFIG_HPP_INCLUDED + + diff --git a/include/boost/type_traits/integral_constant.hpp b/include/boost/type_traits/integral_constant.hpp index a8dbd48..9eed55c 100644 --- a/include/boost/type_traits/integral_constant.hpp +++ b/include/boost/type_traits/integral_constant.hpp @@ -21,6 +21,7 @@ namespace boost{ { template struct bool_; template struct integral_c; + struct integral_c_tag; } } @@ -30,7 +31,7 @@ namespace mpl_{ template struct bool_; template struct integral_c; - + struct integral_c_tag; } namespace boost @@ -39,6 +40,7 @@ namespace boost { using ::mpl_::bool_; using ::mpl_::integral_c; + using ::mpl_::integral_c_tag; } } @@ -49,6 +51,8 @@ namespace boost{ template struct integral_constant { + typedef mpl::integral_c_tag tag; + typedef T value_type; typedef integral_constant type; static const T value = val;