From 2644a3290a3fd21acf120302ad91819740b2cca4 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 18 Sep 2018 12:13:11 +1200
Subject: [PATCH] xapian-check-patch: Check for '> >' and 'template <'

---
 xapian-maintainer-tools/xapian-check-patch | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xapian-maintainer-tools/xapian-check-patch b/xapian-maintainer-tools/xapian-check-patch
index c4a415e75..ee1ddac51 100755
--- a/xapian-maintainer-tools/xapian-check-patch
+++ b/xapian-maintainer-tools/xapian-check-patch
@@ -367,6 +367,12 @@ QUOTELOOP:  while (1) {
 	if (m!^\+.*;\s*(\w+)([-+]{2})\)!) {
 	    diagnostic('error', "Prefer '$2$1' to '$1$2'", $fullline);
 	}
+	if (m!^\+.*?>\s+>!) {
+	    diagnostic('error', "We assume C++11 so can write '>>' instead of '> >'", $fullline);
+	}
+	if (m!^\+.*?\b(?:enable_if|list|map|multimap|multiset|priority_queue|set|template|unordered_map|unordered_set|vector)\s+<!) {
+	    diagnostic('error', "Whitespace between template name and '<'", $fullline);
+	}
 	if (m,^\+\s*[^#].*[\w)](?!-[->]|\+\+)((?:\&\&|\|\||<<|>>|[-+/*%~=<>!&|^])=?|[?]),) {
 	    my @pre = @-;
 	    my @post = @+;
-- 
2.11.4.GIT