From 7e97f4a036a882366e15aae86b4380c29dc1b037 Mon Sep 17 00:00:00 2001 From: olly Date: Fri, 15 Feb 2013 03:58:34 +0000 Subject: [PATCH] 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 --- xapian-core/ChangeLog | 6 ++++++ xapian-core/tests/harness/testsuite.cc | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/xapian-core/ChangeLog b/xapian-core/ChangeLog index e22ead31829..ea8a5156517 100644 --- a/xapian-core/ChangeLog +++ b/xapian-core/ChangeLog @@ -1,3 +1,9 @@ +Fri Feb 15 03:56:32 GMT 2013 Olly Betts + + * 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 * 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 index 6d4843a0c6c..0c809af18b8 100644 --- 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(s), arg)); + short_opts.insert(make_pair(int(s), arg)); opt_help += "[-"; opt_help += s; opt_help += ' ';