[git commit master 1/1] associative_base: Fix compile-error with _associative_citer

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Sun Nov 21 00:23:16 UTC 2010


commit: http://git.uclibc.org/uClibc++/commit/?id=922b0e2ed69117ec572e385c70bb9c03f78263d9
branch: http://git.uclibc.org/uClibc++/commit/?id=refs/heads/master

../include/associative_base:320: error: declaration of ‘typedef class
std::_associative_citer<ValueType, Compare, Allocator>
std::_associative_iter<ValueType, Compare,
Allocator>::_associative_citer’
../include/associative_base:248: error: changes meaning of
‘_associative_citer’ from ‘class std::_associative_citer<ValueType,
Compare, Allocator>’

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 include/associative_base |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/associative_base b/include/associative_base
index 45600a6..af1dd0c 100644
--- a/include/associative_base
+++ b/include/associative_base
@@ -317,7 +317,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:
 	_associative_iter() { }
@@ -345,13 +345,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++(){
@@ -376,8 +376,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;
-- 
1.7.2.2



More information about the uClibc-cvs mailing list