Sync'ed with deveop changes.

This commit is contained in:
Ion Gaztañaga
2014-02-14 22:58:38 +01:00
parent ae31857124
commit 7ca156661f
3 changed files with 3 additions and 11 deletions

View File

@@ -123,8 +123,8 @@ struct node
rebind_pointer<void>::type rebind_pointer<void>::type
> >
{ {
// private: private:
// node(); node();
public: public:
typename ::boost::intrusive::pointer_traits<Pointer>::element_type value; typename ::boost::intrusive::pointer_traits<Pointer>::element_type value;

View File

@@ -68,7 +68,7 @@ class test_allocator
} }
std::size_t max_size() const std::size_t max_size() const
{ return std::size_t(Id); } { return std::size_t(-1); }
T* allocate(std::size_t n) T* allocate(std::size_t n)
{ return (T*)::new char[n*sizeof(T)]; } { return (T*)::new char[n*sizeof(T)]; }

View File

@@ -11,14 +11,6 @@
#include <boost/detail/lightweight_test.hpp> #include <boost/detail/lightweight_test.hpp>
#include <boost/detail/no_exceptions_support.hpp> #include <boost/detail/no_exceptions_support.hpp>
// 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 <vector> #include <vector>
#include <list> #include <list>