Avoid __used. Use __array_used instead.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@93923
138bc75d-0d04-0410-961f-
82ee72b054a4
+2005-01-19 Loren J. Rittle <ljrittle@acm.org>
+
+ * include/ext/array_allocator.h (array_allocator<>::allocate):
+ Avoid __used. Use __array_used instead.
+
2005-01-18 David Edelsohn <edelsohn@gnu.org>
* config/os/aix/os_defines.h (_XOPEN_SOURCE): Delete.
2005-01-18 David Edelsohn <edelsohn@gnu.org>
* config/os/aix/os_defines.h (_XOPEN_SOURCE): Delete.
// array allocator -*- C++ -*-
// array allocator -*- C++ -*-
-// Copyright (C) 2004 Free Software Foundation, Inc.
+// Copyright (C) 2004, 2005 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
//
// 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
pointer
allocate(size_type __n, const void* = 0)
{
pointer
allocate(size_type __n, const void* = 0)
{
- static size_type __used;
- if (_M_array == 0 || __used + __n > _M_array->size())
+ static size_type __array_used;
+ if (_M_array == 0 || __array_used + __n > _M_array->size())
std::__throw_bad_alloc();
std::__throw_bad_alloc();
- pointer __ret = _M_array->begin() + __used;
- __used += __n;
+ pointer __ret = _M_array->begin() + __array_used;
+ __array_used += __n;