Changed assert's to BOOST_ASSERT's.

Made array sizes explicit to fix MWCW problems.


[SVN r26723]
This commit is contained in:
John Maddock
2005-01-18 12:52:40 +00:00
parent 9781fe3150
commit 2a248d1f87
12 changed files with 67 additions and 66 deletions

View File

@ -12,10 +12,10 @@
#ifndef BOOST_DETAIL_ALLOCATOR_HPP
#define BOOST_DETAIL_ALLOCATOR_HPP
#include <boost/config.hpp>
#include <cstdlib>
#include <new>
#include <assert.h>
#include <boost/config.hpp>
#include <boost/assert.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
using ::ptrdiff_t;
@ -133,11 +133,11 @@ public:
void deallocate(pointer p, size_type n)
{
#ifdef BOOST_HAVE_SGI_ALLOCATOR
assert( (p == 0) == (n == 0) );
BOOST_ASSERT( (p == 0) == (n == 0) );
if (p != 0)
alloc_type::deallocate((void*)p, n);
#else
assert( (p == 0) == (n == 0) );
BOOST_ASSERT( (p == 0) == (n == 0) );
if (p != 0)
::operator delete((void*)p);
#endif
@ -204,11 +204,11 @@ public:
void deallocate(pointer p, size_type n)
{
#ifdef BOOST_HAVE_SGI_ALLOCATOR
assert( (p == 0) == (n == 0) );
BOOST_ASSERT( (p == 0) == (n == 0) );
if (p != 0)
alloc_type::deallocate((void*)p, n);
#else
assert( (p == 0) == (n == 0) );
BOOST_ASSERT( (p == 0) == (n == 0) );
if (p != 0)
::operator delete((void*)p);
#endif
@ -252,7 +252,7 @@ public:
void deallocate(pointer p, size_type n)
{
assert( (p == 0) == (n == 0) );
BOOST_ASSERT( (p == 0) == (n == 0) );
if (p != 0)
static_cast<base_type*>(this)->deallocate((void*)p, n * sizeof(value_type));
}