af5fb6ab3b
2002-11-15 Benjamin Kosnik <bkoz@redhat.com>
Gabriel Dos Reis <gdr@integrable-solutions.net>
PR libstdc++/8230
* include/bits/stl_alloc.h: Use builtin_expect for the most
obvious limit checks.
(__default_alloc_template::allocate): Check for null, throw
bad_alloc.
* include/bits/vector.tcc: Formatting tweaks.
* include/bits/stl_vector.h: Same.
* testsuite/20_util/allocator_members.cc (test02): Add.
* testsuite/23_containers/vector_capacity.cc (test03): Add.
Co-Authored-By: Gabriel Dos Reis <gdr@integrable-solutions.net>
From-SVN: r59169
90 lines
2.0 KiB
C++
90 lines
2.0 KiB
C++
// 2001-06-14 Benjamin Kosnik <bkoz@redhat.com>
|
|
|
|
// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
|
|
//
|
|
// This file is part of the GNU ISO C++ Library. This library is free
|
|
// software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU General Public License as published by the
|
|
// Free Software Foundation; either version 2, or (at your option)
|
|
// any later version.
|
|
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License along
|
|
// with this library; see the file COPYING. If not, write to the Free
|
|
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
|
|
// USA.
|
|
|
|
// 20.4.1.1 allocator members
|
|
|
|
#include <memory>
|
|
#include <stdexcept>
|
|
#include <cstdlib>
|
|
#include <testsuite_hooks.h>
|
|
|
|
struct gnu { };
|
|
|
|
bool check_new = false;
|
|
bool check_delete = false;
|
|
|
|
void*
|
|
operator new(std::size_t n) throw(std::bad_alloc)
|
|
{
|
|
check_new = true;
|
|
return std::malloc(n);
|
|
}
|
|
|
|
void operator delete(void *v) throw()
|
|
{
|
|
check_delete = true;
|
|
return std::free(v);
|
|
}
|
|
|
|
void test01()
|
|
{
|
|
bool test = true;
|
|
std::allocator<gnu> obj;
|
|
|
|
// XXX These should work for various size allocation and
|
|
// deallocations. Currently, they only work as expected for sizes >
|
|
// _MAX_BYTES as defined in stl_alloc.h, which happes to be 128.
|
|
gnu* pobj = obj.allocate(256);
|
|
VERIFY( check_new );
|
|
|
|
obj.deallocate(pobj, 256);
|
|
VERIFY( check_delete );
|
|
}
|
|
|
|
// libstdc++/8230
|
|
void test02()
|
|
{
|
|
bool test = true;
|
|
try
|
|
{
|
|
std::allocator<int> alloc;
|
|
const std::allocator<int>::size_type n = alloc.max_size();
|
|
int* p = alloc.allocate(n + 1);
|
|
p[n] = 2002;
|
|
}
|
|
catch(const std::bad_alloc& e)
|
|
{
|
|
// Allowed.
|
|
test = true;
|
|
}
|
|
catch(...)
|
|
{
|
|
test = false;
|
|
}
|
|
VERIFY( test );
|
|
}
|
|
|
|
int main()
|
|
{
|
|
test01();
|
|
test02();
|
|
return 0;
|
|
}
|