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