diff options
| author | dholland <dholland> | 2012-05-07 20:38:40 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2012-05-07 20:38:40 +0000 |
| commit | 25d69750ef1f0569468eb04ef896bfe4ca99a1da (patch) | |
| tree | a91054a97373401437035353231ca0de74955893 /news | |
| parent | 149deefe200e43a3e7f746972e426de6fa72cf55 (diff) | |
| download | pkgsrc-25d69750ef1f0569468eb04ef896bfe4ca99a1da.tar.gz | |
Add patch from Fink to update the C++ dialect.
Diffstat (limited to 'news')
| -rw-r--r-- | news/nget/distinfo | 3 | ||||
| -rw-r--r-- | news/nget/patches/patch-auto__map_h | 51 |
2 files changed, 53 insertions, 1 deletions
diff --git a/news/nget/distinfo b/news/nget/distinfo index a9ef2346bc7..c92b30a4f15 100644 --- a/news/nget/distinfo +++ b/news/nget/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.4 2011/12/06 19:51:07 joerg Exp $ +$NetBSD: distinfo,v 1.5 2012/05/07 20:38:40 dholland Exp $ SHA1 (nget-0.27.1.tar.gz) = 80e348dcb65fcb26cbe037598e676f4770cd7ad1 RMD160 (nget-0.27.1.tar.gz) = b90e3d6e2a33e630144a090f68f9bdd818f5e1bd Size (nget-0.27.1.tar.gz) = 490164 bytes +SHA1 (patch-auto__map_h) = 355d8e02aed69a273a9cf282d6bc868b1b6d1846 SHA1 (patch-cache.h) = 2b8d07aa2a423e2143bf1482592d192c6378e309 SHA1 (patch-nget.cc) = 94b36db92f6fd34d76b33c47173c2db430f418d7 SHA1 (patch-stlhelp.h) = 92851f32b0a2ec402d97b3322d662aea6572dc9d diff --git a/news/nget/patches/patch-auto__map_h b/news/nget/patches/patch-auto__map_h new file mode 100644 index 00000000000..e0c0125a221 --- /dev/null +++ b/news/nget/patches/patch-auto__map_h @@ -0,0 +1,51 @@ +$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 |