Signed-off-by: Alexandros C. Couloumbis alex at ozo.com
--- uClibc++-0.2.2/include/associative_base.orig2007-06-04
01:51:12.0 +0300
+++ uClibc++-0.2.2/include/associative_base 2008-12-05 05:51:25.0
+0200
@@ -74,7 +74,7 @@
typedef typename std::reverse_iteratorconst_iterator
const_reverse_iterator;
- explicit __base_associative(const Compare comp, const Allocator A,
const key_type (*v_to_k)(const value_type))
+ explicit __base_associative(const Compare comp, const Allocator A,
key_type (*v_to_k)(const value_type))
: c(comp), value_to_key(v_to_k) { }
protected:
__base_associative(const associative_type x)
@@ -318,7 +318,7 @@
typedef std::listValueType listtype;
typename listtype::iterator base_iter;
- typedef _associative_citerValueType, Compare, Allocator
_associative_citer;
+ typedef _associative_citerValueType, 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;
@@ -498,7 +498,7 @@
using base::operator==;
using base::operator!=;
- explicit __single_associative(const Compare comp, const Allocator A,
const key_type (*v_to_k)(const value_type))
+ explicit __single_associative(const Compare comp, const Allocator A,
key_type (*v_to_k)(const value_type))
: base(comp, A, v_to_k) { }
template class InputIterator __single_associative(
@@ -506,7 +506,7 @@
InputIterator last,
const Compare comp,
const Allocator A,
- const key_type (*v_to_k)(const value_type)
+ key_type (*v_to_k)(const value_type)
) : base(comp, A, v_to_k) {
insert(first, last);
}
--- uClibc++-0.2.2/include/string.orig 2007-06-04 01:51:12.0 +0300
+++ uClibc++-0.2.2/include/string 2008-02-28 15:54:46.0 +0200
@@ -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);
--- uClibc++-0.2.2/src/string.cpp.orig 2007-06-04 01:51:13.0 +0300
+++ uClibc++-0.2.2/src/string.cpp 2008-02-28 15:54:46.0 +0200
@@ -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);
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
