tests/harness/testsuite.cc: Don't provide explicit template types to

make_pair - it isn't useful, and breaks with C++11. Fixes build error with MSVC2012. git-svn-id: https://svn-dav.xapian.org:8443/xapian/trunk@17069 6b2f1b92-a4f3-0310-943f-de3cbe41748b
dcolish · Feb 15, 2013 · 7e97f4a · 7e97f4a
1 parent 7c46933
commit 7e97f4a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/xapian-core/ChangeLog b/xapian-core/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 15 03:56:32 GMT 2013  Olly Betts <olly@survex.com>
+
+	* tests/harness/testsuite.cc: Don't provide explicit template types to
+	  make_pair - it isn't useful, and breaks with C++11.  Fixes build
+	  error with MSVC2012.
+
 Thu Jan 31 23:39:08 GMT 2013  Olly Betts <olly@survex.com>
 
 	* common/Tokeniseise.pm: Put the binary chop tables with the larger

diff --git a/xapian-core/tests/harness/testsuite.cc b/xapian-core/tests/harness/testsuite.cc
@@ -708,7 +708,7 @@ test_driver::report(const test_driver::result &r, const string &desc)
 void
 test_driver::add_command_line_option(const string &l, char s, string * arg)
 {
-    short_opts.insert(make_pair<int, string *>(int(s), arg));
+    short_opts.insert(make_pair(int(s), arg));
     opt_help += "[-";
     opt_help += s;
     opt_help += ' ';