Skip to content

Commit 1f043d0

Browse files
authored
Merge pull request #317 from nigels-com/revert-issue-209
Partial revert of changes for Issue #209 - compiler warnings
2 parents 08ded32 + 68fa752 commit 1f043d0

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

include/boost/container/detail/pair.hpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,8 @@ template<class A, class B>
555555
struct is_trivially_copy_assignable
556556
<boost::container::dtl::pair<A,B> >
557557
{
558-
BOOST_STATIC_CONSTEXPR bool value = false;
558+
BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_copy_assignable<A>::value &&
559+
boost::move_detail::is_trivially_copy_assignable<B>::value;
559560
};
560561

561562
template<class T>
@@ -565,7 +566,8 @@ template<class A, class B>
565566
struct is_trivially_move_assignable
566567
<boost::container::dtl::pair<A,B> >
567568
{
568-
BOOST_STATIC_CONSTEXPR bool value = false;
569+
BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_move_assignable<A>::value &&
570+
boost::move_detail::is_trivially_move_assignable<B>::value;
569571
};
570572

571573
template<class T>
@@ -574,7 +576,8 @@ struct is_trivially_copy_assignable;
574576
template<class A, class B>
575577
struct is_trivially_copy_constructible<boost::container::dtl::pair<A,B> >
576578
{
577-
BOOST_STATIC_CONSTEXPR bool value = false;
579+
BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_copy_constructible<A>::value &&
580+
boost::move_detail::is_trivially_copy_constructible<B>::value;
578581
};
579582

580583
template<class T>
@@ -583,7 +586,8 @@ struct is_trivially_move_assignable;
583586
template<class A, class B>
584587
struct is_trivially_move_constructible<boost::container::dtl::pair<A,B> >
585588
{
586-
BOOST_STATIC_CONSTEXPR bool value = false;
589+
BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_move_constructible<A>::value &&
590+
boost::move_detail::is_trivially_move_constructible<B>::value;
587591
};
588592

589593
template<class T>
@@ -593,7 +597,7 @@ template<class A, class B>
593597
struct is_trivially_destructible<boost::container::dtl::pair<A,B> >
594598
{
595599
BOOST_STATIC_CONSTEXPR bool value = boost::move_detail::is_trivially_destructible<A>::value &&
596-
boost::move_detail::is_trivially_destructible<B>::value;
600+
boost::move_detail::is_trivially_destructible<B>::value;
597601
};
598602

599603

0 commit comments

Comments
 (0)