Skip to content

Commit 2170155

Browse files
committed
Fixes #312
1 parent 1abb698 commit 2170155

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

doc/container.qbk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1455,6 +1455,7 @@ use [*Boost.Container]? There are several reasons for that:
14551455
* [@https://github.com/boostorg/container/issues/309 GitHub #309: ['"Performance regression of boost::container::static_vector introduced in boost v1.86"]].
14561456
* [@https://github.com/boostorg/container/issues/306 GitHub #306: ['"new_allocator.hpp error: '__cpp_sized_deallocation' is not defined, evaluates to 0 [-Werror,-Wundef]"]].
14571457
* [@https://github.com/boostorg/container/issues/310 GitHub #310: ['"flat_map: Mention correct type in documentation of emplace and emplace_hint"]].
1458+
* [@https://github.com/boostorg/container/issues/312 GitHub #312: ['"flat_map std::allocator::is_always_equal is deprecated"]].
14581459
* [@https://github.com/boostorg/container/pull/317/ GitHub #317: ['"Partial revert of changes for Issue #209 - compiler warnings"]].
14591460

14601461
[endsect]

include/boost/container/allocator_traits.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ template<class Allocator>
227227
struct is_not_std_allocator
228228
{ BOOST_STATIC_CONSTEXPR bool value = !is_std_allocator<Allocator>::value; };
229229

230+
#if defined(BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED)
231+
#pragma GCC diagnostic push
232+
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
233+
#endif
234+
230235
BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(pointer)
231236
BOOST_INTRUSIVE_INSTANTIATE_EVAL_DEFAULT_TYPE_TMPLT(const_pointer)
232237
BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(reference)
@@ -241,6 +246,10 @@ BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(is_always_equal)
241246
BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(difference_type)
242247
BOOST_INTRUSIVE_INSTANTIATE_DEFAULT_TYPE_TMPLT(is_partially_propagable)
243248

249+
#if defined(BOOST_CONTAINER_GCC_COMPATIBLE_HAS_DIAGNOSTIC_IGNORED)
250+
#pragma GCC diagnostic pop
251+
#endif
252+
244253
} //namespace dtl {
245254

246255
#endif //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED

0 commit comments

Comments
 (0)