From 7ca156661fb1b8455362f639975459f0825ea75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Fri, 14 Feb 2014 22:58:38 +0100 Subject: [PATCH] Sync'ed with deveop changes. --- include/boost/container/stable_vector.hpp | 4 ++-- test/scoped_allocator_adaptor_test.cpp | 2 +- test/static_vector_test.cpp | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/include/boost/container/stable_vector.hpp b/include/boost/container/stable_vector.hpp index 84e6d7c..aef7bbc 100644 --- a/include/boost/container/stable_vector.hpp +++ b/include/boost/container/stable_vector.hpp @@ -123,8 +123,8 @@ struct node rebind_pointer::type > { -// private: -// node(); + private: + node(); public: typename ::boost::intrusive::pointer_traits::element_type value; diff --git a/test/scoped_allocator_adaptor_test.cpp b/test/scoped_allocator_adaptor_test.cpp index 75f1655..990f81e 100644 --- a/test/scoped_allocator_adaptor_test.cpp +++ b/test/scoped_allocator_adaptor_test.cpp @@ -68,7 +68,7 @@ class test_allocator } std::size_t max_size() const - { return std::size_t(Id); } + { return std::size_t(-1); } T* allocate(std::size_t n) { return (T*)::new char[n*sizeof(T)]; } diff --git a/test/static_vector_test.cpp b/test/static_vector_test.cpp index 30914af..4521aef 100644 --- a/test/static_vector_test.cpp +++ b/test/static_vector_test.cpp @@ -11,14 +11,6 @@ #include #include -// TODO: Disable parts of the unit test that should not run when BOOST_NO_EXCEPTIONS -// if exceptions are enabled there must be a user defined throw_exception function -#ifdef BOOST_NO_EXCEPTIONS -namespace boost { - void throw_exception(std::exception const &){}; // user defined -} // namespace boost -#endif // BOOST_NO_EXCEPTIONS - #include #include