|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r65252 - sandbox/chrono/boost/type_traits
From: vicente.botet_at_[hidden]
Date: 2010-09-04 09:22:21
Author: viboes
Date: 2010-09-04 09:22:20 EDT (Sat, 04 Sep 2010)
New Revision: 65252
URL: http://svn.boost.org/trac/boost/changeset/65252
Log:
Continue the library split with Boost.TypeTraits.Ext
Text files modified:
sandbox/chrono/boost/type_traits/common_type.hpp | 190 ---------------------------------------
1 files changed, 4 insertions(+), 186 deletions(-)
Modified: sandbox/chrono/boost/type_traits/common_type.hpp
==============================================================================
--- sandbox/chrono/boost/type_traits/common_type.hpp (original)
+++ sandbox/chrono/boost/type_traits/common_type.hpp 2010-09-04 09:22:20 EDT (Sat, 04 Sep 2010)
@@ -6,192 +6,10 @@
// Distributed under the Boost Software License, Version 1.0.
// See http://www.boost.org/LICENSE_1_0.txt
-#ifndef BOOST_COMMON_TYPE_HPP
-#define BOOST_COMMON_TYPE_HPP
+#ifndef BOOST_TYPE_TRAITS_COMMON_TYPE_HPP
+#define BOOST_TYPE_TRAITS_COMMON_TYPE_HPP
-#include <boost/config.hpp>
+#include <boost/type_traits/ext/common_type.hpp>
-//----------------------------------------------------------------------------//
-#if defined(BOOST_NO_VARIADIC_TEMPLATES)
-#define BOOST_COMMON_TYPE_ARITY 3
-#endif
-//----------------------------------------------------------------------------//
-#if defined(BOOST_NO_DECLTYPE) && !defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
-#define BOOST_TYPEOF_SILENT
-#include <boost/typeof/typeof.hpp> // boost wonders never cease!
-#endif
-
-//----------------------------------------------------------------------------//
-#ifndef BOOST_NO_STATIC_ASSERT
-#define BOOST_COMMON_TYPE_STATIC_ASSERT(CND, MSG, TYPES) static_assert(CND,MSG)
-#elif defined(BOOST_COMMON_TYPE_USES_STATIC_ASSERT)
-#include <boost/static_assert.hpp>
-#define BOOST_COMMON_TYPE_STATIC_ASSERT(CND, MSG, TYPES) BOOST_STATIC_ASSERT(CND)
-#elif defined(BOOST_COMMON_TYPE_USES_MPL_ASSERT)
-#include <boost/mpl/assert.hpp>
-#include <boost/mpl/bool.hpp>
-#define BOOST_COMMON_TYPE_STATIC_ASSERT(CND, MSG, TYPES) \
- BOOST_MPL_ASSERT_MSG(boost::mpl::bool_< (CND) >::type::value, MSG, TYPES)
-#elif defined(BOOST_COMMON_TYPE_USES_ARRAY_ASSERT)
-#define BOOST_COMMON_TYPE_CONCAT(A,B) A##B
-#define BOOST_COMMON_TYPE_NAME(A,B) BOOST_COMMON_TYPE_CONCAT(A,B)
-#define BOOST_COMMON_TYPE_STATIC_ASSERT(CND, MSG, TYPES) static char BOOST_COMMON_TYPE_NAME(__boost_common_type_test_,__LINE__)[CND]
-#else
-#define BOOST_COMMON_TYPE_STATIC_ASSERT(CND, MSG, TYPES)
-#endif
-
-#if !defined(BOOST_NO_STATIC_ASSERT) || !defined(BOOST_COMMON_TYPE_USES_MPL_ASSERT)
-#define BOOST_COMMON_TYPE_MUST_BE_A_COMPLE_TYPE "must be complete type"
-#endif
-
-#include <boost/type_traits/detail/common_type.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/type_traits/is_void.hpp>
-#include <boost/type_traits/is_reference.hpp>
-#include <boost/type_traits/is_pointer.hpp>
-#include <boost/type_traits/remove_cv.hpp>
-
-//----------------------------------------------------------------------------//
-// //
-// C++03 implementation of //
-// 20.6.7 Other transformations [meta.trans.other] //
-// Written by Howard Hinnant //
-// Adapted for Boost by Beman Dawes //
-// //
-//----------------------------------------------------------------------------//
-
-namespace boost {
-
-// prototype
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
- template<typename... T>
- struct common_type;
-#else // or no specialization
- template <class T, class U = void, class V = void>
- struct common_type
- {
- public:
- typedef typename common_type<typename common_type<T, U>::type, V>::type type;
- };
-#endif
-
-
-// 1 arg
- template<typename T>
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
- struct common_type<T>
-#else
- struct common_type<T, void, void>
-
-#endif
- {
- BOOST_COMMON_TYPE_STATIC_ASSERT(sizeof(T) > 0, BOOST_COMMON_TYPE_MUST_BE_A_COMPLE_TYPE, (T));
- public:
- typedef T type;
- };
-
-// 2 args
-
-
- namespace type_traits_detail {
-
- template <typename T,
- bool = !is_reference<T>::value && ! is_pointer<T>::value && !is_void<T>::value>
- struct add_rvalue_reference_helper
- { typedef T type; };
-
- template <typename T>
- struct add_rvalue_reference_helper<T, true>
- {
-#if !defined(BOOST_NO_RVALUE_REFERENCES)
- typedef T&& type;
-#else
- typedef T type;
-#endif
- };
-
- /// add_rvalue_reference
- template <typename T>
- struct add_rvalue_reference
- : public add_rvalue_reference_helper<T>
- { };
-
- template <typename T>
- struct add_rvalue_reference<T&>
- { typedef T& type;
- };
-
-
- template <typename T>
- typename add_rvalue_reference<T>::type declval();
-
- template <class T, class U>
- struct common_type_2
- {
- private:
- BOOST_COMMON_TYPE_STATIC_ASSERT(sizeof(T) > 0, BOOST_COMMON_TYPE_MUST_BE_A_COMPLE_TYPE, (T));
- BOOST_COMMON_TYPE_STATIC_ASSERT(sizeof(U) > 0, BOOST_COMMON_TYPE_MUST_BE_A_COMPLE_TYPE, (U));
- static bool declval_bool(); // workaround gcc bug; not required by std
- static typename add_rvalue_reference_helper<T>::type declval_T(); // workaround gcc bug; not required by std
- static typename add_rvalue_reference_helper<U>::type declval_U(); // workaround gcc bug; not required by std
-
-#if !defined(BOOST_NO_DECLTYPE)
- public:
- typedef decltype(declval<bool>() ? declval<T>() : declval<U>()) type;
-#elif defined(BOOST_COMMON_TYPE_DONT_USE_TYPEOF)
-#if 0
- typedef char (&yes)[1];
- typedef char (&no)[2];
- //~ static yes deduce(typename add_rvalue_reference_helper<T>::type);
- //~ static no deduce(typename add_rvalue_reference_helper<U>::type);
- static yes deduce(T);
- static no deduce(U);
- public:
- typedef typename mpl::if_c<
- sizeof( deduce( declval_bool() ? declval_T() : declval_U() ) ) == sizeof( yes ),
- T,
- U
- >::type type;
-#else
- public:
- typedef typename detail_type_traits_common_type::common_type_impl<
- typename remove_cv<T>::type,
- typename remove_cv<U>::type
- >::type type;
-#endif
-#else
- public:
- typedef BOOST_TYPEOF_TPL(declval_bool() ? declval_T() : declval_U()) type;
-#endif
- };
-
- template <class T>
- struct common_type_2<T, T>
- {
- typedef T type;
- };
- }
-
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
- template <class T, class U>
- struct common_type<T, U>
-#else
- template <class T, class U>
- struct common_type<T, U, void>
-#endif
- : type_traits_detail::common_type_2<T,U>
- { };
-
-
-// 3 or more args
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
- template<typename T, typename U, typename... V>
- struct common_type<T, U, V...> {
- public:
- typedef typename common_type<typename common_type<T, U>::type, V...>::type type;
- };
-#endif
-} // namespace boost
-
-#endif // BOOST_COMMON_TYPE_HPP
+#endif // BOOST_TYPE_TRAITS_COMMON_TYPE_HPP
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk