feedc0de/boost_optional
1
0
Fork 0
forked from boostorg/optional
Code Pull Requests Activity

fixed regression on compilers w/o type trait support

Browse Source
This commit is contained in:
Andrzej Krzemienski
2017-11-01 06:44:26 +01:00
parent a7f33f5d6f
commit 9d0ddc4709
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/optional/optional.hpp
View File

@ -827,13 +827,21 @@ struct is_type_trivially_copyable
} // namespace optional_detail } // namespace optional_detail
namespace optional_config { namespace optional_config {
#ifndef BOOST_OPTIONAL_DETAIL_NO_SPEC_FOR_TRIVIAL_TYPES
template <typename T> template <typename T>
struct is_type_trivial struct is_type_trivial
: boost::conditional< (optional_detail::is_type_trivially_copyable<T>::value && BOOST_HAS_TRIVIAL_CONSTRUCTOR(T)) || : boost::conditional< (optional_detail::is_type_trivially_copyable<T>::value && BOOST_HAS_TRIVIAL_CONSTRUCTOR(T)) ||
(boost::is_scalar<T>::value && !boost::is_const<T>::value && !boost::is_volatile<T>::value) (boost::is_scalar<T>::value && !boost::is_const<T>::value && !boost::is_volatile<T>::value)
, boost::true_type, boost::false_type>::type , boost::true_type, boost::false_type>::type
{}; {};
#else
template <typename T>
struct is_type_trivial
: boost::conditional<(boost::is_scalar<T>::value && !boost::is_const<T>::value && !boost::is_volatile<T>::value)
, boost::true_type, boost::false_type>::type
{};
#endif
} // namespace optional_config } // namespace optional_config