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

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