Mon May 7 20:38:41 2012 UTC ()
Add patch from Fink to update the C++ dialect.


(dholland)
diff -r1.4 -r1.5 pkgsrc/news/nget/distinfo
diff -r0 -r1.1 pkgsrc/news/nget/patches/patch-auto__map_h

cvs diff -r1.4 -r1.5 pkgsrc/news/nget/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/news/nget/Attic/distinfo 2011/12/06 19:51:07 1.4
+++ pkgsrc/news/nget/Attic/distinfo 2012/05/07 20:38:40 1.5
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.4 2011/12/06 19:51:07 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2012/05/07 20:38:40 dholland Exp $
2 2
3SHA1 (nget-0.27.1.tar.gz) = 80e348dcb65fcb26cbe037598e676f4770cd7ad1 3SHA1 (nget-0.27.1.tar.gz) = 80e348dcb65fcb26cbe037598e676f4770cd7ad1
4RMD160 (nget-0.27.1.tar.gz) = b90e3d6e2a33e630144a090f68f9bdd818f5e1bd 4RMD160 (nget-0.27.1.tar.gz) = b90e3d6e2a33e630144a090f68f9bdd818f5e1bd
5Size (nget-0.27.1.tar.gz) = 490164 bytes 5Size (nget-0.27.1.tar.gz) = 490164 bytes
 6SHA1 (patch-auto__map_h) = 355d8e02aed69a273a9cf282d6bc868b1b6d1846
6SHA1 (patch-cache.h) = 2b8d07aa2a423e2143bf1482592d192c6378e309 7SHA1 (patch-cache.h) = 2b8d07aa2a423e2143bf1482592d192c6378e309
7SHA1 (patch-nget.cc) = 94b36db92f6fd34d76b33c47173c2db430f418d7 8SHA1 (patch-nget.cc) = 94b36db92f6fd34d76b33c47173c2db430f418d7
8SHA1 (patch-stlhelp.h) = 92851f32b0a2ec402d97b3322d662aea6572dc9d 9SHA1 (patch-stlhelp.h) = 92851f32b0a2ec402d97b3322d662aea6572dc9d

File Added: pkgsrc/news/nget/patches/Attic/patch-auto__map_h
$NetBSD: patch-auto__map_h,v 1.1 2012/05/07 20:38:41 dholland Exp $

Update the C++ dialect.

--- auto_map.h.orig	2004-06-17 21:00:33.000000000 +0000
+++ auto_map.h
@@ -23,10 +23,10 @@
 #include <assert.h>
 #include <map>
 
-template <class K, class T, template <class BK, class BT> class Base>
-class auto_map_base : public Base<K, restricted_ptr<T> > {
+template <class K, class T,  class Base>
+class auto_map_base : public Base {
 	protected:
-		typedef Base<K, restricted_ptr<T> > super;
+		typedef Base super;
 	public:
 		typedef typename super::iterator iterator;
 
@@ -55,9 +55,9 @@ class auto_map_base : public Base<K, res
 
 
 template <class K, class T>
-class auto_map : public auto_map_base<K, T, std::map> {
+class auto_map : public auto_map_base<K, T, std::map<K, restricted_ptr<T> > > {
 	public:
-		typedef typename auto_map_base<K, T, std::map>::super super;
+		typedef typename auto_map_base<K, T, std::map<K, restricted_ptr<T> > >::super super;
 		typedef typename super::iterator iterator;
 		typedef typename super::value_type value_type;
 		/*super::value_type value_type(const K &k, T*p) {
@@ -68,15 +68,15 @@ class auto_map : public auto_map_base<K,
 			return super::insert(v);
 		}*/
 		std::pair<iterator, bool> 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
-			assert(find(k)==this->end());
+			assert(this->find(k)==this->end());
 			return super::insert(value_type(k, restricted_ptr<T>(p)));
 		}
 };
 
 template <class K, class T>
-class auto_multimap : public auto_map_base<K, T, std::multimap> {
+class auto_multimap : public auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > > {
 	public:
-		typedef typename auto_map_base<K, T, std::multimap>::super super;
+		typedef typename auto_map_base<K, T, std::multimap<K, restricted_ptr<T> > >::super super;
 		typedef typename super::iterator iterator;
 		typedef typename super::value_type value_type;
 		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