bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix uclibc++ for gcc 4.3 and uclibc 0.9.30 (thx to Alexandros C. Couloumbis)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@14231 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-01-27 22:43:41 +00:00
parent 65ad7ae03a
commit 6bc6a498d4
1 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libs/uclibc++/patches/009-compile_fixes.patch Normal file
View File

@ -0,0 +1,79 @@
--- a/include/associative_base
+++ b/include/associative_base
@@ -74,7 +74,7 @@ public:
typedef typename std::reverse_iterator<const_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 @@ 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;
--- a/include/string
+++ b/include/string
@@ -1017,11 +1017,11 @@ template<class charT, class traits, clas
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);
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -76,11 +76,11 @@ namespace std{
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);