--- debian/patches/0004-use-std-make_pair.patch | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 28 insertions(+) create mode 100644 debian/patches/0004-use-std-make_pair.patch
diff --git a/debian/patches/0004-use-std-make_pair.patch b/debian/patches/0004-use-std-make_pair.patch new file mode 100644 index 0000000..db39665 --- /dev/null +++ b/debian/patches/0004-use-std-make_pair.patch @@ -0,0 +1,27 @@ +Description: Fix FTBFS with gcc 4.7 by specifying the std namespace for make_pair(). +Bug-Debian: http://bugs.debian.org/671941 +Author: Cyril Brulebois <k...@debian.org> +--- a/src/dict.h ++++ b/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; diff --git a/debian/patches/series b/debian/patches/series index 5a894e7..9eac3e5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0001-sort_by_dir.patch 0002-strrchr_instead_of_g_strrstr.patch 0003-g_ascii_strcasecmp_instead_of_g_strcasecmp.patch +0004-use-std-make_pair.patch -- 1.7.10 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
