diff options
| author | joerg <joerg@pkgsrc.org> | 2012-12-22 20:03:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2012-12-22 20:03:47 +0000 |
| commit | 8ae50417679d2f2925f1f36d0364b355d8c4a4bc (patch) | |
| tree | f9ebabc349fe74c51dc7503ae7a050611cfdc9cb /sysutils | |
| parent | 50b990c1da10aeb1c4989c5874531e4307cac93f (diff) | |
| download | pkgsrc-8ae50417679d2f2925f1f36d0364b355d8c4a4bc.tar.gz | |
Pick up make_pair from the correct namespace.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gnome-commander/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/gnome-commander/patches/patch-src_dict.h | 26 |
2 files changed, 28 insertions, 1 deletions
diff --git a/sysutils/gnome-commander/distinfo b/sysutils/gnome-commander/distinfo index 3a04d300eb4..45270e60f9f 100644 --- a/sysutils/gnome-commander/distinfo +++ b/sysutils/gnome-commander/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.13 2011/12/16 11:00:12 drochner Exp $ +$NetBSD: distinfo,v 1.14 2012/12/22 20:03:47 joerg Exp $ SHA1 (gnome-commander-1.2.8.15.tar.xz) = b70521c7487fa3dea5e7f8a444c6207441317a17 RMD160 (gnome-commander-1.2.8.15.tar.xz) = 1a2710608da6b25ec27c6c1d719d5692c029507e Size (gnome-commander-1.2.8.15.tar.xz) = 3637808 bytes SHA1 (patch-aa) = bdc924914e80b2dd9844f2c77555131fa299c351 +SHA1 (patch-src_dict.h) = 1dc8e8e0261c911bcaa8cde788d441d33057e269 diff --git a/sysutils/gnome-commander/patches/patch-src_dict.h b/sysutils/gnome-commander/patches/patch-src_dict.h new file mode 100644 index 00000000000..840ddf00e65 --- /dev/null +++ b/sysutils/gnome-commander/patches/patch-src_dict.h @@ -0,0 +1,26 @@ +$NetBSD: patch-src_dict.h,v 1.1 2012/12/22 20:03:47 joerg Exp $ + +--- src/dict.h.orig 2012-12-22 19:19:36.000000000 +0000 ++++ src/dict.h +@@ -55,8 +55,8 @@ class DICT + template <typename KEY, typename VAL> + inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v) + { +- std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL)); +- std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL)); ++ std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL)); ++ std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL)); + + if (k_pos.second) + k_pos.first->second = &v_pos.first->first; +@@ -114,8 +114,8 @@ class DICT<T,T> + template <typename T> + inline void DICT<T,T>::add(const T k, const T &v) + { +- std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(make_pair(k,(T *) NULL)); +- std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(make_pair(v,(T *) NULL)); ++ std::pair<typename T_COLL::iterator,bool> k_pos = t_coll.insert(std::make_pair(k,(T *) NULL)); ++ std::pair<typename T_COLL::iterator,bool> v_pos = t_coll.insert(std::make_pair(v,(T *) NULL)); + + if (k_pos.second) + k_pos.first->second = &v_pos.first->first; |