882b3d5c2e
2010-05-20 Paolo Carlini <paolo.carlini@oracle.com> PR libstdc++/41792 * include/tr1_impl/array: Use std::__addressof. * include/std/functional (reference_wrapper): Likewise. * include/ext/throw_allocator.h: Likewise. * include/ext/pool_allocator.h: Likewise. * include/ext/bitmap_allocator.h: Likewise. * include/ext/new_allocator.h: Likewise. * include/ext/malloc_allocator.h: Likewise. * include/ext/array_allocator.h: Likewise. * include/ext/mt_allocator.h: Likewise. * include/ext/extptr_allocator.h: Likewise. * include/bits/stl_list.h: Likewise. * include/bits/hashtable_policy.h: Likewise. * include/bits/forward_list.h: Likewise. * include/bits/stl_uninitialized.h: Likewise. * include/bits/list.tcc: Likewise. * include/bits/stl_construct.h: Likewise. * include/bits/stl_tree.h: Likewise. * testsuite/20_util/reference_wrapper/41792.cc: New. * testsuite/23_containers/unordered_map/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/multimap/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/set/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/unordered_multimap/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/forward_list/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/unordered_set/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/vector/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/deque/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/multiset/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/list/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/unordered_multiset/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/map/requirements/ explicit_instantiation/4.cc: Likewise. * testsuite/23_containers/array/requirements/ explicit_instantiation/3.cc: Likewise. * testsuite/23_containers/forward_list/requirements/ dr438/assign_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/forward_list/requirements/dr438/ insert_neg.cc: Likewise. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/forward_list/requirements/dr438/ constructor_2_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/ assign_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/ insert_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/list/requirements/dr438/ constructor_2_neg.cc: Likewise. 2010-05-20 Peter Dimov <pdimov@pdimov.com> Paolo Carlini <paolo.carlini@oracle.com> * include/bits/move.h (__addressof, addressof): Add. * testsuite/util/testsuite_api.h (struct OverloadedAddress): Add. * testsuite/20_util/addressof/requirements/ explicit_instantiation.cc: New. * testsuite/20_util/addressof/1.cc: Likewise. From-SVN: r159643
177 lines
5.5 KiB
C++
177 lines
5.5 KiB
C++
// <extptr_allocator.h> -*- C++ -*-
|
|
|
|
// Copyright (C) 2008, 2009, 2010 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 3, 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.
|
|
|
|
// Under Section 7 of GPL version 3, you are granted additional
|
|
// permissions described in the GCC Runtime Library Exception, version
|
|
// 3.1, as published by the Free Software Foundation.
|
|
|
|
// You should have received a copy of the GNU General Public License and
|
|
// a copy of the GCC Runtime Library Exception along with this program;
|
|
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
// <http://www.gnu.org/licenses/>.
|
|
|
|
/**
|
|
* @file ext/extptr_allocator.h
|
|
* @author Bob Walters
|
|
*
|
|
* An example allocator which uses an alternative pointer type from
|
|
* bits/pointer.h. Supports test cases which confirm container support
|
|
* for alternative pointers.
|
|
*/
|
|
|
|
#ifndef _EXTPTR_ALLOCATOR_H
|
|
#define _EXTPTR_ALLOCATOR_H 1
|
|
|
|
#include <memory>
|
|
#include <limits>
|
|
#include <ext/pointer.h>
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
|
|
|
|
/**
|
|
* @brief An example allocator which uses a non-standard pointer type.
|
|
* @ingroup allocators
|
|
*
|
|
* This allocator specifies that containers use a 'relative pointer' as it's
|
|
* pointer type. (See ext/pointer.h) Memory allocation in this example
|
|
* is still performed using std::allocator.
|
|
*/
|
|
template<typename _Tp>
|
|
class _ExtPtr_allocator
|
|
{
|
|
public:
|
|
typedef std::size_t size_type;
|
|
typedef std::ptrdiff_t difference_type;
|
|
|
|
// Note the non-standard pointer types.
|
|
typedef _Pointer_adapter<_Relative_pointer_impl<_Tp> > pointer;
|
|
typedef _Pointer_adapter<_Relative_pointer_impl<const _Tp> >
|
|
const_pointer;
|
|
|
|
typedef _Tp& reference;
|
|
typedef const _Tp& const_reference;
|
|
typedef _Tp value_type;
|
|
|
|
template<typename _Up>
|
|
struct rebind
|
|
{ typedef _ExtPtr_allocator<_Up> other; };
|
|
|
|
_ExtPtr_allocator() throw()
|
|
: _M_real_alloc() { }
|
|
|
|
_ExtPtr_allocator(const _ExtPtr_allocator &__rarg) throw()
|
|
: _M_real_alloc(__rarg._M_real_alloc) { }
|
|
|
|
template<typename _Up>
|
|
_ExtPtr_allocator(const _ExtPtr_allocator<_Up>& __rarg) throw()
|
|
: _M_real_alloc(__rarg._M_getUnderlyingImp()) { }
|
|
|
|
~_ExtPtr_allocator() throw()
|
|
{ }
|
|
|
|
pointer address(reference __x) const
|
|
{ return std::__addressof(__x); }
|
|
|
|
const_pointer address(const_reference __x) const
|
|
{ return std::__addressof(__x); }
|
|
|
|
pointer allocate(size_type __n, void* __hint = 0)
|
|
{ return _M_real_alloc.allocate(__n,__hint); }
|
|
|
|
void deallocate(pointer __p, size_type __n)
|
|
{ _M_real_alloc.deallocate(__p.get(), __n); }
|
|
|
|
size_type max_size() const throw()
|
|
{ return std::numeric_limits<size_type>::max() / sizeof(_Tp); }
|
|
|
|
void construct(pointer __p, const _Tp& __val)
|
|
{ ::new(__p.get()) _Tp(__val); }
|
|
|
|
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
|
template<typename... _Args>
|
|
void
|
|
construct(pointer __p, _Args&&... __args)
|
|
{ ::new(__p.get()) _Tp(std::forward<_Args>(__args)...); }
|
|
#endif
|
|
|
|
void destroy(pointer __p)
|
|
{ __p->~_Tp(); }
|
|
|
|
template<typename _Up>
|
|
inline bool
|
|
operator==(const _ExtPtr_allocator<_Up>& __rarg)
|
|
{ return _M_real_alloc == __rarg._M_getUnderlyingImp(); }
|
|
|
|
inline bool
|
|
operator==(const _ExtPtr_allocator& __rarg)
|
|
{ return _M_real_alloc == __rarg._M_real_alloc; }
|
|
|
|
template<typename _Up>
|
|
inline bool
|
|
operator!=(const _ExtPtr_allocator<_Up>& __rarg)
|
|
{ return _M_real_alloc != __rarg._M_getUnderlyingImp(); }
|
|
|
|
inline bool
|
|
operator!=(const _ExtPtr_allocator& __rarg)
|
|
{ return _M_real_alloc != __rarg._M_real_alloc; }
|
|
|
|
template<typename _Up>
|
|
inline friend void
|
|
swap(_ExtPtr_allocator<_Up>&, _ExtPtr_allocator<_Up>&);
|
|
|
|
// A method specific to this implementation.
|
|
const std::allocator<_Tp>&
|
|
_M_getUnderlyingImp() const
|
|
{ return _M_real_alloc; }
|
|
|
|
private:
|
|
std::allocator<_Tp> _M_real_alloc;
|
|
};
|
|
|
|
// _ExtPtr_allocator<void> specialization.
|
|
template<>
|
|
class _ExtPtr_allocator<void>
|
|
{
|
|
public:
|
|
typedef std::size_t size_type;
|
|
typedef std::ptrdiff_t difference_type;
|
|
typedef void value_type;
|
|
|
|
// Note the non-standard pointer types
|
|
typedef _Pointer_adapter<_Relative_pointer_impl<void> > pointer;
|
|
typedef _Pointer_adapter<_Relative_pointer_impl<const void> >
|
|
const_pointer;
|
|
|
|
template<typename _Up>
|
|
struct rebind
|
|
{ typedef _ExtPtr_allocator<_Up> other; };
|
|
|
|
private:
|
|
std::allocator<void> _M_real_alloc;
|
|
};
|
|
|
|
template<typename _Tp>
|
|
inline void
|
|
swap(_ExtPtr_allocator<_Tp>& __larg, _ExtPtr_allocator<_Tp>& __rarg)
|
|
{
|
|
std::allocator<_Tp> __tmp( __rarg._M_real_alloc );
|
|
__rarg._M_real_alloc = __larg._M_real_alloc;
|
|
__larg._M_real_alloc = __tmp;
|
|
}
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
#endif /* _EXTPTR_ALLOCATOR_H */
|