1.1 --- a/epoc32/include/stdapis/stlportv5/stl/_ctraits_fns.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/stdapis/stlportv5/stl/_ctraits_fns.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -9,7 +9,7 @@
     1.4   * in supporting documentation.  Silicon Graphics makes no
     1.5   * representations about the suitability of this software for any
     1.6   * purpose.  It is provided "as is" without express or implied warranty.
     1.7 - */ 
     1.8 + */
     1.9  
    1.10  // WARNING: This is an internal header file, included by other C++
    1.11  // standard library headers.  You should not attempt to use this header
    1.12 @@ -18,34 +18,34 @@
    1.13  #ifndef _STLP_INTERNAL_CTRAITS_FUNCTIONS_H
    1.14  #define _STLP_INTERNAL_CTRAITS_FUNCTIONS_H
    1.15  
    1.16 -# ifndef _STLP_INTERNAL_FUNCTION_H 
    1.17 +#ifndef _STLP_INTERNAL_FUNCTION_BASE_H
    1.18  #  include <stl/_function_base.h>
    1.19 -# endif
    1.20 +#endif
    1.21  
    1.22  // This file contains a few small adapters that allow a character
    1.23  // traits class to be used as a function object.
    1.24  
    1.25  _STLP_BEGIN_NAMESPACE
    1.26  
    1.27 +_STLP_MOVE_TO_PRIV_NAMESPACE
    1.28 +
    1.29  template <class _Traits>
    1.30  struct _Eq_traits
    1.31    : public binary_function<typename _Traits::char_type,
    1.32                             typename _Traits::char_type,
    1.33 -                           bool>
    1.34 -{
    1.35 +                           bool> {
    1.36    bool operator()(const typename _Traits::char_type& __x,
    1.37                    const typename _Traits::char_type& __y) const
    1.38 -    { return _Traits::eq(__x, __y); }
    1.39 +  { return _Traits::eq(__x, __y); }
    1.40  };
    1.41  
    1.42  template <class _Traits>
    1.43  struct _Eq_char_bound
    1.44 -  : public unary_function<typename _Traits::char_type, bool>
    1.45 -{
    1.46 +  : public unary_function<typename _Traits::char_type, bool> {
    1.47    typename _Traits::char_type __val;
    1.48    _Eq_char_bound(typename _Traits::char_type __c) : __val(__c) {}
    1.49    bool operator()(const typename _Traits::char_type& __x) const
    1.50 -    { return _Traits::eq(__x, __val); }
    1.51 +  { return _Traits::eq(__x, __val); }
    1.52  };
    1.53  
    1.54  template <class _Traits>
    1.55 @@ -55,32 +55,32 @@
    1.56    typename _Traits::char_type __val;
    1.57    _Neq_char_bound(typename _Traits::char_type __c) : __val(__c) {}
    1.58    bool operator()(const typename _Traits::char_type& __x) const
    1.59 -    { return !_Traits::eq(__x, __val); }
    1.60 +  { return !_Traits::eq(__x, __val); }
    1.61  };
    1.62  
    1.63  template <class _Traits>
    1.64  struct _Eq_int_bound
    1.65 -  : public unary_function<typename _Traits::char_type, bool>
    1.66 -{
    1.67 +  : public unary_function<typename _Traits::char_type, bool> {
    1.68    typename _Traits::int_type __val;
    1.69  
    1.70    _Eq_int_bound(typename _Traits::int_type __c) : __val(__c) {}
    1.71    bool operator()(const typename _Traits::char_type& __x) const
    1.72 -    { return _Traits::eq_int_type(_Traits::to_int_type(__x), __val); }
    1.73 +  { return _Traits::eq_int_type(_Traits::to_int_type(__x), __val); }
    1.74  };
    1.75  
    1.76 -# if 0
    1.77 +#if 0
    1.78  template <class _Traits>
    1.79  struct _Lt_traits
    1.80    : public binary_function<typename _Traits::char_type,
    1.81                             typename _Traits::char_type,
    1.82 -                           bool>
    1.83 -{
    1.84 +                           bool> {
    1.85    bool operator()(const typename _Traits::char_type& __x,
    1.86                    const typename _Traits::char_type& __y) const
    1.87 -    { return _Traits::lt(__x, __y); }
    1.88 +  { return _Traits::lt(__x, __y); }
    1.89  };
    1.90 -# endif
    1.91 +#endif
    1.92 +
    1.93 +_STLP_MOVE_TO_STD_NAMESPACE
    1.94  
    1.95  _STLP_END_NAMESPACE
    1.96  
    1.97 @@ -89,7 +89,3 @@
    1.98  // Local Variables:
    1.99  // mode:C++
   1.100  // End:
   1.101 -
   1.102 -
   1.103 -
   1.104 -