| 1 |
dragonheart 08/05/04 01:34:26 |
| 2 |
|
| 3 |
Added: nget-0.27.1-gcc-4.3.patch |
| 4 |
Log: |
| 5 |
gcc-4.3 fix as per bug #199587 thanks to upstream for the patch, Mark for pointing me to it and Diego for reporting the bug |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-nntp/nget/files/nget-0.27.1-gcc-4.3.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nntp/nget/files/nget-0.27.1-gcc-4.3.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-nntp/nget/files/nget-0.27.1-gcc-4.3.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: nget-0.27.1-gcc-4.3.patch |
| 15 |
=================================================================== |
| 16 |
--- auto_map.h 2004/06/17 20:59:44 1.8 |
| 17 |
+++ auto_map.h 2008/03/03 06:41:59 1.9 |
| 18 |
@@ -23,10 +23,10 @@ |
| 19 |
#include <assert.h> |
| 20 |
#include <map> |
| 21 |
|
| 22 |
-template <class K, class T, template <class BK, class BT> class Base> |
| 23 |
-class auto_map_base : public Base<K, restricted_ptr<T> > { |
| 24 |
+template <class K, class T, class Base> |
| 25 |
+class auto_map_base : public Base { |
| 26 |
protected: |
| 27 |
- typedef Base<K, restricted_ptr<T> > super; |
| 28 |
+ typedef Base super; |
| 29 |
public: |
| 30 |
typedef typename super::iterator iterator; |
| 31 |
|
| 32 |
@@ -55,9 +55,9 @@ |
| 33 |
|
| 34 |
|
| 35 |
template <class K, class T> |
| 36 |
-class auto_map : public auto_map_base<K, T, std::map> { |
| 37 |
+class auto_map : public auto_map_base<K, T, std::map<K, restricted_ptr<T> > > { |
| 38 |
public: |
| 39 |
- typedef typename auto_map_base<K, T, std::map>::super super; |
| 40 |
+ typedef typename auto_map_base<K, T, std::map<K, restricted_ptr<T> > >::super super; |
| 41 |
typedef typename super::iterator iterator; |
| 42 |
typedef typename super::value_type value_type; |
| 43 |
/*super::value_type value_type(const K &k, T*p) { |
| 44 |
@@ -74,9 +74,9 @@ |
| 45 |
}; |
| 46 |
|
| 47 |
template <class K, class T> |
| 48 |
-class auto_multimap : public auto_map_base<K, T, std::multimap> { |
| 49 |
+class auto_multimap : public auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > > { |
| 50 |
public: |
| 51 |
- typedef typename auto_map_base<K, T, std::multimap>::super super; |
| 52 |
+ typedef typename auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > >::super super; |
| 53 |
typedef typename super::iterator iterator; |
| 54 |
typedef typename super::value_type value_type; |
| 55 |
iterator insert_value(const K &k, T* p) { //we can't really use the normal insert funcs, but we don't want to just name it insert since it would be easy to confuse with all the normal map insert funcs |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
-- |
| 60 |
gentoo-commits@l.g.o mailing list |
Archives