Sat Dec 22 20:03:48 2012 UTC ()
Pick up make_pair from the correct namespace.
(joerg)
diff -r1.13 -r1.14 pkgsrc/sysutils/gnome-commander/distinfo
diff -r0 -r1.1 pkgsrc/sysutils/gnome-commander/patches/patch-src_dict.h
--- pkgsrc/sysutils/gnome-commander/Attic/distinfo 2011/12/16 11:00:12 1.13
+++ pkgsrc/sysutils/gnome-commander/Attic/distinfo 2012/12/22 20:03:47 1.14
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.13 2011/12/16 11:00:12 drochner Exp $ | | 1 | $NetBSD: distinfo,v 1.14 2012/12/22 20:03:47 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (gnome-commander-1.2.8.15.tar.xz) = b70521c7487fa3dea5e7f8a444c6207441317a17 | | 3 | SHA1 (gnome-commander-1.2.8.15.tar.xz) = b70521c7487fa3dea5e7f8a444c6207441317a17 |
| 4 | RMD160 (gnome-commander-1.2.8.15.tar.xz) = 1a2710608da6b25ec27c6c1d719d5692c029507e | | 4 | RMD160 (gnome-commander-1.2.8.15.tar.xz) = 1a2710608da6b25ec27c6c1d719d5692c029507e |
| 5 | Size (gnome-commander-1.2.8.15.tar.xz) = 3637808 bytes | | 5 | Size (gnome-commander-1.2.8.15.tar.xz) = 3637808 bytes |
| 6 | SHA1 (patch-aa) = bdc924914e80b2dd9844f2c77555131fa299c351 | | 6 | SHA1 (patch-aa) = bdc924914e80b2dd9844f2c77555131fa299c351 |
| | | 7 | SHA1 (patch-src_dict.h) = 1dc8e8e0261c911bcaa8cde788d441d33057e269 |
$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;