*** allocator_orig.h	2008-08-07 00:34:58.000000000 -0400
--- allocator.h	2008-08-10 15:03:38.000000000 -0400
***************
*** 52,57 ****
--- 52,61 ----
  // Define the base class to std::allocator.
  #include <bits/c++allocator.h>
  
+ #include <ext/pointer.h>
+ using _gcc_cxx::__pointer;
+ using _gcc_cxx::std_pointer_impl;
+ 
  _GLIBCXX_BEGIN_NAMESPACE(std)
  
    template<typename _Tp>
***************
*** 64,71 ****
      public:
        typedef size_t      size_type;
        typedef ptrdiff_t   difference_type;
!       typedef void*       pointer;
!       typedef const void* const_pointer;
        typedef void        value_type;
  
        template<typename _Tp1>
--- 69,76 ----
      public:
        typedef size_t      size_type;
        typedef ptrdiff_t   difference_type;
!       typedef __pointer<std_pointer_impl<void> > pointer;
!       typedef __pointer<std_pointer_impl<const void> > const_pointer;
        typedef void        value_type;
  
        template<typename _Tp1>
***************
*** 85,92 ****
     public:
        typedef size_t     size_type;
        typedef ptrdiff_t  difference_type;
!       typedef _Tp*       pointer;
!       typedef const _Tp* const_pointer;
        typedef _Tp&       reference;
        typedef const _Tp& const_reference;
        typedef _Tp        value_type;
--- 90,97 ----
     public:
        typedef size_t     size_type;
        typedef ptrdiff_t  difference_type;
!       typedef __pointer<std_pointer_impl<_Tp> > pointer;
!       typedef __pointer<std_pointer_impl<const _Tp> > const_pointer;
        typedef _Tp&       reference;
        typedef const _Tp& const_reference;
        typedef _Tp        value_type;