From fd2c49c1134505cd42ae866a425ef17ebe2bece4 Mon Sep 17 00:00:00 2001 From: mbm Date: Wed, 6 Sep 2006 17:19:25 +0000 Subject: [PATCH] patch from #744; thanks Tristan git-svn-id: svn://svn.openwrt.org/openwrt/packages@4762 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- libs/uclibc++/patches/001-lower_bound.patch | 157 ++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 libs/uclibc++/patches/001-lower_bound.patch diff --git a/libs/uclibc++/patches/001-lower_bound.patch b/libs/uclibc++/patches/001-lower_bound.patch new file mode 100644 index 000000000..9780b9793 --- /dev/null +++ b/libs/uclibc++/patches/001-lower_bound.patch @@ -0,0 +1,157 @@ +diff -Nur uClibc++-0.2.0/include/map uClibc++-0.2.0-patched/include/map +--- uClibc++-0.2.0/include/map 2006-02-28 17:35:16.000000000 -0800 ++++ uClibc++-0.2.0-patched/include/map 2006-09-06 00:42:25.000000000 -0700 +@@ -599,7 +599,7 @@ + return retval; + } + +- retval.first = lower_bound(x.first); ++ retval.first = __base_map::lower_bound(x.first); + + //No match - this should never happen + if(retval.first == end()){ +@@ -616,7 +616,7 @@ + typename deque, allocator > >::iterator q(&data, retval.first.element); + data.insert(q, x); + +- retval.first = lower_bound(x.first); //Need to refind because insert can move data around ++ retval.first = __base_map::lower_bound(x.first); //Need to refind because insert can move data around + retval.second = true; + + return retval; +@@ -680,7 +680,7 @@ + return end(); + } + +- iterator retval = lower_bound(x); ++ iterator retval = __base_map::lower_bound(x); + + if(retval == end()){ + return retval; +@@ -702,7 +702,7 @@ + return end(); + } + +- const_iterator retval = lower_bound(x); ++ const_iterator retval = __base_map::lower_bound(x); + + if(retval == end()){ + return retval; +@@ -730,7 +730,7 @@ + typename map::iterator + map::upper_bound(const key_type& x) + { +- typename map::iterator i = lower_bound(x); ++ typename map::iterator i = __base_map::lower_bound(x); + if( i != end() && !c(x, i->first) ){ + ++i; + } +@@ -741,7 +741,7 @@ + typename map::const_iterator + map::upper_bound(const key_type& x) const + { +- typename map::const_iterator i = lower_bound(x); ++ typename map::const_iterator i = __base_map::lower_bound(x); + if(i != end() && !c(x, i->first)){ + ++i; + } +@@ -757,8 +757,8 @@ + pair< typename map::iterator, + typename map::iterator + > retval; +- retval.first = lower_bound(x); +- retval.second = upper_bound(x); ++ retval.first = __base_map::lower_bound(x); ++ retval.second = __base_map::upper_bound(x); + return retval; + } + +@@ -770,8 +770,8 @@ + pair< typename map::const_iterator, + typename map::const_iterator + > retval; +- retval.first = lower_bound(x); +- retval.second = upper_bound(x); ++ retval.first = __base_map::lower_bound(x); ++ retval.second = __base_map::upper_bound(x); + return retval; + } + +@@ -902,7 +902,7 @@ + return end(); + } + +- retval = lower_bound(x.first); ++ retval = __base_map::lower_bound(x.first); + + //No match - this should never happen + if(retval == end()){ +@@ -973,8 +973,8 @@ + typename multimap::size_type + multimap::erase(const key_type& x) + { +- typename multimap::iterator f = lower_bound(x); +- typename multimap::iterator l = upper_bound(x); ++ typename multimap::iterator f = __base_map::lower_bound(x); ++ typename multimap::iterator l = __base_map::upper_bound(x); + size_type t = l.element - f.element; + erase(f, l); + return t; +@@ -999,7 +999,7 @@ + return end(); + } + +- iterator retval = lower_bound(x); ++ iterator retval = __base_map::lower_bound(x); + + if(retval == end()){ + return retval; +@@ -1027,7 +1027,7 @@ + if(data.size() == 0){ + return end(); + } +- const_iterator retval = lower_bound(x); ++ const_iterator retval = __base_map::lower_bound(x); + + if(retval == end()){ + return retval; +@@ -1065,7 +1065,7 @@ + typename multimap::iterator + multimap::upper_bound(const key_type& x) + { +- typename multimap::iterator i = lower_bound(x); ++ typename multimap::iterator i = __base_map::lower_bound(x); + + while(i != end() && !c(x, i->first)){ + ++i; +@@ -1077,7 +1077,7 @@ + typename multimap::const_iterator + multimap::upper_bound(const key_type& x) const + { +- typename multimap::const_iterator i = lower_bound(x); ++ typename multimap::const_iterator i = __base_map::lower_bound(x); + + while(i != end() && !c(x, i->first)){ + ++i; +@@ -1094,8 +1094,8 @@ + pair< typename multimap::iterator, + typename multimap::iterator + > retval; +- retval.first = lower_bound(x); +- retval.second = upper_bound(x); ++ retval.first = __base_map::lower_bound(x); ++ retval.second = __base_map::upper_bound(x); + return retval; + } + +@@ -1107,8 +1107,8 @@ + pair< typename multimap::const_iterator, + typename multimap::const_iterator + > retval; +- retval.first = lower_bound(x); +- retval.second = upper_bound(x); ++ retval.first = __base_map::lower_bound(x); ++ retval.second = __base_map::upper_bound(x); + return retval; + } + -- 2.11.0