Remove constructible_with_allocator_suffix/constructible_with_allocator_prefix from documentation as they are not needed now. Utilities will reman anonymous to maintain a minimum backwards compatibility.

Author: igaztanaga

include/boost/container/uses_allocator.hpp

@@ -17,99 +17,6 @@
 namespace boost {
 namespace container {
 
-//! <b>Remark</b>: if a specialization constructible_with_allocator_suffix<X>::value is true, indicates that T may be constructed
-//! with an allocator as its last constructor argument.  Ideally, all constructors of T (including the
-//! copy and move constructors) should have a variant that accepts a final argument of
-//! allocator_type.
-//!
-//! <b>Requires</b>: if a specialization constructible_with_allocator_suffix<X>::value is true, T must have a nested type,
-//! allocator_type and at least one constructor for which allocator_type is the last
-//! parameter.  If not all constructors of T can be called with a final allocator_type argument,
-//! and if T is used in a context where a container must call such a constructor, then the program is
-//! ill-formed.
-//!
-//! <code>
-//!  template <class T, class Allocator = allocator<T> >
-//!  class Z {
-//!    public:
-//!      typedef Allocator allocator_type;
-//!
-//!    // Default constructor with optional allocator suffix
-//!    Z(const allocator_type& a = allocator_type());
-//!
-//!    // Copy constructor and allocator-extended copy constructor
-//!    Z(const Z& zz);
-//!    Z(const Z& zz, const allocator_type& a);
-//! };
-//!
-//! // Specialize trait for class template Z
-//! template <class T, class Allocator = allocator<T> >
-//! struct constructible_with_allocator_suffix<Z<T,Allocator> >
-//! { static const bool value = true;  };
-//! </code>
-//!
-//! <b>Note</b>: This trait is a workaround inspired by "N2554: The Scoped A Model (Rev 2)"
-//! (Pablo Halpern, 2008-02-29) to backport the scoped allocator model to C++03, as
-//! in C++03 there is no mechanism to detect if a type can be constructed from arbitrary arguments.
-//! Applications aiming portability with several compilers should always define this trait.
-//!
-//! In conforming C++11 compilers or compilers supporting SFINAE expressions
-//! (when BOOST_NO_SFINAE_EXPR is NOT defined), this trait is ignored and C++11 rules will be used
-//! to detect if a type should be constructed with suffix or prefix allocator arguments.
-template <class T>
-struct constructible_with_allocator_suffix
-{  BOOST_STATIC_CONSTEXPR bool value = false; };
-
-//! <b>Remark</b>: if a specialization constructible_with_allocator_prefix<X>::value is true, indicates that T may be constructed
-//! with allocator_arg and T::allocator_type as its first two constructor arguments.
-//! Ideally, all constructors of T (including the copy and move constructors) should have a variant
-//! that accepts these two initial arguments.
-//!
-//! <b>Requires</b>: specialization constructible_with_allocator_prefix<X>::value is true, T must have a nested type,
-//! allocator_type and at least one constructor for which allocator_arg_t is the first
-//! parameter and allocator_type is the second parameter.  If not all constructors of T can be
-//! called with these initial arguments, and if T is used in a context where a container must call such
-//! a constructor, then the program is ill-formed.
-//!
-//! <code>
-//! template <class T, class Allocator = allocator<T> >
-//! class Y {
-//!    public:
-//!       typedef Allocator allocator_type;
-//!
-//!       // Default constructor with and allocator-extended default constructor
-//!       Y();
-//!       Y(allocator_arg_t, const allocator_type& a);
-//!
-//!       // Copy constructor and allocator-extended copy constructor
-//!       Y(const Y& yy);
-//!       Y(allocator_arg_t, const allocator_type& a, const Y& yy);
-//!
-//!       // Variadic constructor and allocator-extended variadic constructor
-//!       template<class ...Args> Y(Args&& args...);
-//!       template<class ...Args>
-//!       Y(allocator_arg_t, const allocator_type& a, BOOST_FWD_REF(Args)... args);
-//! };
-//!
-//! // Specialize trait for class template Y
-//! template <class T, class Allocator = allocator<T> >
-//! struct constructible_with_allocator_prefix<Y<T,Allocator> >
-//! { static const bool value = true;  };
-//!
-//! </code>
-//!
-//! <b>Note</b>: This trait is a workaround inspired by "N2554: The Scoped Allocator Model (Rev 2)"
-//! (Pablo Halpern, 2008-02-29) to backport the scoped allocator model to C++03, as
-//! in C++03 there is no mechanism to detect if a type can be constructed from arbitrary arguments.
-//! Applications aiming portability with several compilers should always define this trait.
-//!
-//! In conforming C++11 compilers or compilers supporting SFINAE expressions
-//! (when BOOST_NO_SFINAE_EXPR is NOT defined), this trait is ignored and C++11 rules will be used
-//! to detect if a type should be constructed with suffix or prefix allocator arguments.
-template <class T>
-struct constructible_with_allocator_prefix
-{  BOOST_STATIC_CONSTEXPR bool value = false; };
-
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 namespace dtl {
@@ -147,18 +54,26 @@ struct uses_allocator_imp
 
 }  //namespace dtl {
 
+template <class T>
+struct constructible_with_allocator_prefix
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
+
+template <class T>
+struct constructible_with_allocator_suffix
+{  BOOST_STATIC_CONSTEXPR bool value = false; };
+
 #endif   //#ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 //! <b>Remark</b>: Automatically detects whether T has a nested allocator_type that is convertible from
 //! Allocator. Meets the BinaryTypeTrait requirements ([meta.rqmts] 20.4.1). A program may
-//! specialize this type to define uses_allocator<X>::value as true for a T of user-defined type if T does not
+//! specialize this type to define `uses_allocator<X>::value` as true for a T of user-defined type if T does not
 //! have a nested allocator_type but is nonetheless constructible using the specified Allocator where either:
-//! the first argument of a constructor has type allocator_arg_t and the second argument has type Alloc or
-//! the last argument of a constructor has type Alloc.
+//! the first argument of a constructor has type `allocator_arg_t` and the second argument has type `Allocator` or
+//! the last argument of a constructor has type `Allocator`.
 //!
-//! <b>Result</b>: uses_allocator<T, Allocator>::value== true if a type T::allocator_type
-//! exists and either is_convertible<Alloc, T::allocator_type>::value != false or T::allocator_type
-//! is an alias `erased_type`. False otherwise.
+//! <b>Result</b>: `uses_allocator<T, Allocator>::value == true` if a type `T::allocator_type`
+//! exists and either `is_convertible<Allocator, T::allocator_type>::value != false` or `T::allocator_type`
+//! is an alias of `erased_type`. False otherwise.
 template <typename T, typename Allocator>
 struct uses_allocator
    : dtl::uses_allocator_imp<T, Allocator>

include/boost/container/uses_allocator_fwd.hpp

@@ -15,9 +15,7 @@
 #include <boost/container/detail/std_fwd.hpp>
 
 //! \file
-//!   This header forward declares boost::container::constructible_with_allocator_prefix,
-//!   boost::container::constructible_with_allocator_suffix and
-//!   boost::container::uses_allocator. Also defines the following types:
+//!   This header forward declares boost::container::uses_allocator. Also defines the following types:
 
 namespace boost {
 namespace container {

test/propagate_allocator_test.hpp

@@ -138,7 +138,6 @@ bool test_propagate_allocator()
          PropagateCont c2(c); //should propagate 223
          BOOST_TEST (c2.get_stored_allocator().id_ == 223);
          BOOST_TEST (c2.get_stored_allocator().ctr_copies_ >= 1);
-         BOOST_TEST (c2.get_stored_allocator().ctr_moves_ >= 0);
          BOOST_TEST (c2.get_stored_allocator().assign_copies_ == 0);
          BOOST_TEST (c2.get_stored_allocator().assign_moves_ == 0);
          BOOST_TEST (c2.get_stored_allocator().swaps_ == 0);
@@ -237,8 +236,6 @@ bool test_propagate_allocator()
          BOOST_TEST (c.get_stored_allocator().id_ == 223);
          NoPropagateCont c2(c); //should NOT propagate 223
          BOOST_TEST (c2.get_stored_allocator().id_ == 224);
-         BOOST_TEST (c2.get_stored_allocator().ctr_copies_ >= 0);
-         BOOST_TEST (c2.get_stored_allocator().ctr_moves_ >= 0);
          BOOST_TEST (c2.get_stored_allocator().assign_copies_ == 0);
          BOOST_TEST (c2.get_stored_allocator().assign_moves_ == 0);
          BOOST_TEST (c2.get_stored_allocator().swaps_ == 0);
@@ -249,8 +246,6 @@ bool test_propagate_allocator()
          NoPropagateCont c; //stored 334
          BOOST_TEST (c.get_stored_allocator().id_ == 334);
          NoPropagateCont c2(boost::move(c)); // should NOT propagate 334
-         BOOST_TEST (c2.get_stored_allocator().ctr_copies_ >= 0);
-         BOOST_TEST (c2.get_stored_allocator().ctr_moves_ >= 0);
          BOOST_TEST (c2.get_stored_allocator().assign_copies_ == 0);
          BOOST_TEST (c2.get_stored_allocator().assign_moves_ == 0);
          BOOST_TEST (c2.get_stored_allocator().swaps_ == 0);

test/propagation_test_allocator.hpp

@@ -230,39 +230,4 @@ struct allocator_argument_tester
    int                  value;
 };
 
-namespace boost {
-namespace container {
-
-template<unsigned int AllocatorTag>
-struct constructible_with_allocator_prefix
-   < ::allocator_argument_tester<ConstructiblePrefix, AllocatorTag> >
-{
-   static const bool value = true;
-};
-
-template<unsigned int AllocatorTag>
-struct constructible_with_allocator_prefix
-   < ::allocator_argument_tester<ErasedTypePrefix, AllocatorTag> >
-{
-   static const bool value = true;
-};
-
-
-template<unsigned int AllocatorTag>
-struct constructible_with_allocator_suffix
-   < ::allocator_argument_tester<ConstructibleSuffix, AllocatorTag> >
-{
-   static const bool value = true;
-};
-
-template<unsigned int AllocatorTag>
-struct constructible_with_allocator_suffix
-   < ::allocator_argument_tester<ErasedTypeSuffix, AllocatorTag> >
-{
-   static const bool value = true;
-};
-
-}  //namespace container {
-}  //namespace boost {
-
 #endif   //BOOST_CONTAINER_TEST_ALLOCATOR_ARGUMENT_TESTER_HPP

test/uses_allocator_test.cpp

@@ -67,16 +67,5 @@ int main()
                            < allocator_argument_tester<ErasedTypePrefix, 0>
                            , propagation_test_allocator<float, 0>
                            >::value ));
-   BOOST_CONTAINER_STATIC_ASSERT((  true == constructible_with_allocator_prefix
-                           < allocator_argument_tester<ConstructiblePrefix, 0> >::value ));
-
-   BOOST_CONTAINER_STATIC_ASSERT((  true == constructible_with_allocator_suffix
-                           < allocator_argument_tester<ConstructibleSuffix, 0> >::value ));
-
-   BOOST_CONTAINER_STATIC_ASSERT((  true == constructible_with_allocator_prefix
-                           < allocator_argument_tester<ErasedTypePrefix, 0> >::value ));
-
-   BOOST_CONTAINER_STATIC_ASSERT((  true == constructible_with_allocator_suffix
-                           < allocator_argument_tester<ErasedTypeSuffix, 0> >::value ));
    return 0;
 }