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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
|
diff -ru uClibc++-0.2.2.orig/include/associative_base uClibc++-0.2.2/include/associative_base
--- uClibc++-0.2.2.orig/include/associative_base 2009-03-03 14:03:40.000000000 +0000
+++ uClibc++-0.2.2/include/associative_base 2009-03-03 14:03:52.000000000 +0000
@@ -318,7 +318,7 @@
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 @@
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 @@
--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;
diff -ru uClibc++-0.2.2.orig/include/string uClibc++-0.2.2/include/string
--- uClibc++-0.2.2.orig/include/string 2009-03-03 14:03:40.000000000 +0000
+++ uClibc++-0.2.2/include/string 2009-03-03 14:03:52.000000000 +0000
@@ -1017,11 +1017,11 @@
template <> _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
template <> _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
-template <> _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
+template <> _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
template <> _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
template <> _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
-template <> _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
+template <> _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
template <> _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
template <> _UCXXEXPORT string operator+(const char* lhs, const string & rhs);
diff -ru uClibc++-0.2.2.orig/src/string.cpp uClibc++-0.2.2/src/string.cpp
--- uClibc++-0.2.2.orig/src/string.cpp 2009-03-03 14:03:41.000000000 +0000
+++ uClibc++-0.2.2/src/string.cpp 2009-03-03 14:03:52.000000000 +0000
@@ -76,11 +76,11 @@
template _UCXXEXPORT bool operator==(const string & lhs, const string & rhs);
template _UCXXEXPORT bool operator==(const char * lhs, const string & rhs);
- template _UCXXEXPORT bool operator==(const string & rhs, const char * rhs);
+ template _UCXXEXPORT bool operator==(const string & lhs, const char * rhs);
template _UCXXEXPORT bool operator!=(const string & lhs, const string & rhs);
template _UCXXEXPORT bool operator!=(const char * lhs, const string & rhs);
- template _UCXXEXPORT bool operator!=(const string & rhs, const char * rhs);
+ template _UCXXEXPORT bool operator!=(const string & lhs, const char * rhs);
template _UCXXEXPORT string operator+(const string & lhs, const char* rhs);
template _UCXXEXPORT string operator+(const char* lhs, const string & rhs);
|
