Index: stl_deque.h
===================================================================
--- stl_deque.h	(revision 138941)
+++ stl_deque.h	(working copy)
@@ -218,7 +218,7 @@
       operator[](difference_type __n) const
       { return *(*this + __n); }
 
-      /** 
+      /**
        *  Prepares to traverse new_node.  Sets everything except
        *  _M_cur, which should therefore be set by the caller
        *  immediately afterwards, based on _M_first and _M_last.
@@ -445,7 +445,7 @@
 
       _Tp*
       _M_allocate_node()
-      { 
+      {
 	return _M_impl._Tp_alloc_type::allocate(__deque_buf_size(sizeof(_Tp)));
       }
 
@@ -653,10 +653,10 @@
 
     public:
       typedef _Tp                                        value_type;
-      typedef typename _Tp_alloc_type::pointer           pointer;
-      typedef typename _Tp_alloc_type::const_pointer     const_pointer;
-      typedef typename _Tp_alloc_type::reference         reference;
-      typedef typename _Tp_alloc_type::const_reference   const_reference;
+      typedef value_type*                                pointer;
+      typedef const value_type*                          const_pointer;
+      typedef value_type&                                reference;
+      typedef const value_type&                          const_reference;
       typedef typename _Base::iterator                   iterator;
       typedef typename _Base::const_iterator             const_iterator;
       typedef std::reverse_iterator<const_iterator>      const_reverse_iterator;
@@ -681,7 +681,7 @@
       using _Base::_M_deallocate_map;
       using _Base::_M_get_Tp_allocator;
 
-      /** 
+      /**
        *  A total of four data members accumulated down the hierarchy.
        *  May be accessed via _M_impl.*
        */
@@ -727,7 +727,7 @@
        */
       deque(const deque& __x)
       : _Base(__x._M_get_Tp_allocator(), __x.size())
-      { std::__uninitialized_copy_a(__x.begin(), __x.end(), 
+      { std::__uninitialized_copy_a(__x.begin(), __x.end(),
 				    this->_M_impl._M_start,
 				    _M_get_Tp_allocator()); }
 
@@ -818,7 +818,7 @@
       {
 	// NB: DR 675.
 	this->clear();
-	this->swap(__x); 
+	this->swap(__x);
 	return *this;
       }