libs/uclibc++/patches/009-compile_fixes.patch

   1 --- a/include/associative_base
   2 +++ b/include/associative_base
   3 @@ -74,7 +74,7 @@ public:
   4         typedef typename std::reverse_iterator<const_iterator>          const_reverse_iterator;
   5
   6
   7 -       explicit __base_associative(const Compare& comp, const Allocator& A, const key_type (*v_to_k)(const value_type))
   8 +       explicit __base_associative(const Compare& comp, const Allocator& A, key_type (*v_to_k)(const value_type))
   9                 : c(comp), value_to_key(v_to_k) { }
  10  protected:
  11         __base_associative(const associative_type& x)
  12 @@ -318,7 +318,7 @@ protected:
  13         typedef std::list<ValueType> listtype;
  14
  15         typename listtype::iterator base_iter;
  16 -       typedef _associative_citer<ValueType, Compare, Allocator> _associative_citer;
  17 +       typedef _associative_citer<ValueType, Compare, Allocator> __associative_citer;
  18
  19
  20  public:
  21 @@ -347,13 +347,13 @@ public:
  22         bool operator==(const _associative_iter & m) const{
  23                 return m.base_iter == base_iter;
  24         }
  25 -       bool operator==(const _associative_citer & m) const{
  26 +       bool operator==(const __associative_citer & m) const{
  27                 return m.base_iter == base_iter;
  28         }
  29         bool operator!=(const _associative_iter & m) const{
  30                 return m.base_iter != base_iter;
  31         }
  32 -       bool operator!=(const _associative_citer & m) const{
  33 +       bool operator!=(const __associative_citer & m) const{
  34                 return m.base_iter != base_iter;
  35         }
  36         _associative_iter & operator++(){
  37 @@ -378,8 +378,8 @@ public:
  38                 --base_iter;
  39                 return temp;
  40         }
  41 -       operator _associative_citer() const{
  42 -               return _associative_citer(base_iter);
  43 +       operator __associative_citer() const{
  44 +               return __associative_citer(base_iter);
  45         }
  46         typename listtype::iterator base_iterator(){
  47                 return base_iter;
  48 --- a/include/string
  49 +++ b/include/string
  50 @@ -1017,11 +1017,11 @@ template<class charT, class traits, clas
  51
  52  template <> _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
  53  template <> _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
  54 -template <> _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
  55 +template <> _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
  56
  57  template <> _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
  58  template <> _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
  59 -template <> _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
  60 +template <> _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
  61
  62  template <> _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
  63  template <> _UCXXEXPORT string operator+(const char* lhs, const string & rhs);
  64 --- a/src/string.cpp
  65 +++ b/src/string.cpp
  66 @@ -76,11 +76,11 @@ namespace std{
  67
  68         template _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
  69         template _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
  70 -       template _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
  71 +       template _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
  72
  73         template _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
  74         template _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
  75 -       template _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
  76 +       template _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
  77
  78         template _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
  79         template _UCXXEXPORT string operator+(const char* lhs, const string & rhs);