Merged from trunk

[SVN r79559]
This commit is contained in:
Ion Gaztañaga
2012-07-16 09:04:33 +00:00
parent bd7e6c3fd9
commit d535f151e7
9 changed files with 40 additions and 72 deletions
+8 -7
View File
@@ -8,20 +8,15 @@
//
//////////////////////////////////////////////////////////////////////////////
#include <boost/container/detail/config_begin.hpp>
#include <boost/container/scoped_allocator.hpp>
#include <boost/container/scoped_allocator_fwd.hpp>
#include <cstddef>
#include <boost/static_assert.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/container/detail/function_detector.hpp>
#include <boost/container/detail/mpl.hpp>
#include <boost/move/move.hpp>
#include <boost/type_traits/integral_constant.hpp>
#include <memory>
#include <boost/container/vector.hpp>
#include <boost/container/detail/pair.hpp>
using namespace boost::container;
template<class T, unsigned int Id, bool Propagate = false>
class test_allocator
{
@@ -242,6 +237,12 @@ struct constructible_with_allocator_suffix
} //namespace boost {
#include <boost/container/scoped_allocator.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/static_assert.hpp>
#include <boost/container/vector.hpp>
#include <boost/container/detail/pair.hpp>
int main()
{
typedef test_allocator<tagged_integer<0>, 0> OuterAlloc;