[clanlib] 01/02: Let std::make_pair() infer its type parameters.

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository clanlib.

commit 7f6431102df2a0827aa84b3451432d508659615e
Author: Stephen Kitt <steve at sk2.org>
Date:   Sat Aug 6 09:53:42 2016 +0200

    Let std::make_pair() infer its type parameters.
---
 debian/changelog                  |  7 +++++++
 debian/patches/440_makepair.patch | 17 +++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 19ba2b8..8c16841 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+clanlib (1.0~svn3827-6) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Let std::make_pair() infer its type parameters. (Closes: #831082)
+
+ -- Stephen Kitt <skitt at debian.org>  Fri, 05 Aug 2016 23:35:04 +0200
+
 clanlib (1.0~svn3827-5) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/440_makepair.patch b/debian/patches/440_makepair.patch
new file mode 100644
index 0000000..8351135
--- /dev/null
+++ b/debian/patches/440_makepair.patch
@@ -0,0 +1,17 @@
+Description: Drop the type args from std::make_pair()
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/Sources/Core/IOData/Generic/datafile_inputprovider.h
++++ b/Sources/Core/IOData/Generic/datafile_inputprovider.h
+@@ -142,9 +142,9 @@
+ 		void insert(const std::string &resource_id, int data_pos, int data_size)
+ 		{
+ 			cache.insert(
+-				std::make_pair<std::string const, std::pair<int, int> >(
++				std::make_pair(
+ 				resource_id,
+-				std::make_pair<int,int>(data_pos, data_size)));
++				std::make_pair(data_pos, data_size)));
+ 		}
+ 
+ 	private:
diff --git a/debian/patches/series b/debian/patches/series
index 16abf7e..d2a7cff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 410_libpng16.patch
 420_reproducible.patch
 430_privacy.patch
+440_makepair.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/clanlib.git