patch-include_associative_base 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. --- uClibc++-0.2.2.orig/include/associative_base 2007-06-04 00:51:12.000000000 +0200
  2. +++ uClibc++-0.2.2/include/associative_base 2009-11-20 23:08:04.000000000 +0100
  3. @@ -318,7 +318,7 @@ protected:
  4. typedef std::list<ValueType> listtype;
  5. typename listtype::iterator base_iter;
  6. - typedef _associative_citer<ValueType, Compare, Allocator> _associative_citer;
  7. + typedef _associative_citer<ValueType, Compare, Allocator> __associative_citer;
  8. public:
  9. @@ -347,13 +347,13 @@ public:
  10. bool operator==(const _associative_iter & m) const{
  11. return m.base_iter == base_iter;
  12. }
  13. - bool operator==(const _associative_citer & m) const{
  14. + bool operator==(const __associative_citer & m) const{
  15. return m.base_iter == base_iter;
  16. }
  17. bool operator!=(const _associative_iter & m) const{
  18. return m.base_iter != base_iter;
  19. }
  20. - bool operator!=(const _associative_citer & m) const{
  21. + bool operator!=(const __associative_citer & m) const{
  22. return m.base_iter != base_iter;
  23. }
  24. _associative_iter & operator++(){
  25. @@ -378,8 +378,8 @@ public:
  26. --base_iter;
  27. return temp;
  28. }
  29. - operator _associative_citer() const{
  30. - return _associative_citer(base_iter);
  31. + operator __associative_citer() const{
  32. + return __associative_citer(base_iter);
  33. }
  34. typename listtype::iterator base_iterator(){
  35. return base_iter;