From 7cf7c9c263f2650ea560959fd1407f350bc52fe7 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Tue, 20 Mar 2018 10:30:51 +1300
Subject: [PATCH] [honey] Don't include <iostream> by default

In the past we found this caused problems on some platforms.
---
 xapian-core/backends/honey/honey_compact.cc |  1 -
 xapian-core/backends/honey/honey_cursor.cc  |  7 ++++---
 xapian-core/backends/honey/honey_table.cc   | 10 +++++++---
 xapian-core/backends/honey/honey_table.h    |  4 +++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/xapian-core/backends/honey/honey_compact.cc b/xapian-core/backends/honey/honey_compact.cc
index 00f840b87..8f975c6a6 100644
--- a/xapian-core/backends/honey/honey_compact.cc
+++ b/xapian-core/backends/honey/honey_compact.cc
@@ -27,7 +27,6 @@
 #include "xapian/types.h"
 
 #include <algorithm>
-#include <iostream>
 #include <memory>
 #include <queue>
 #include <type_traits>
diff --git a/xapian-core/backends/honey/honey_cursor.cc b/xapian-core/backends/honey/honey_cursor.cc
index 6aa879783..32af77041 100644
--- a/xapian-core/backends/honey/honey_cursor.cc
+++ b/xapian-core/backends/honey/honey_cursor.cc
@@ -24,9 +24,10 @@
 
 #include <string>
 
-#define DEBUGGING false
-
-#ifdef DEBUGGING
+#if 1
+# define DEBUGGING false
+#else
+# define DEBUGGING true
 # include <iostream>
 #endif
 
diff --git a/xapian-core/backends/honey/honey_table.cc b/xapian-core/backends/honey/honey_table.cc
index f363d651b..e9e83fc61 100644
--- a/xapian-core/backends/honey/honey_table.cc
+++ b/xapian-core/backends/honey/honey_table.cc
@@ -21,15 +21,19 @@
 
 #include <config.h>
 
-static bool DEBUGGING = false;
-
 #include "honey_table.h"
 
 #include "honey_cursor.h"
 #include "stringutils.h"
 
 #include "unicode/description_append.h"
-#include <iostream>
+
+#if 1
+# define DEBUGGING false
+#else
+# define DEBUGGING true
+# include <iostream>
+#endif
 
 using Honey::RootInfo;
 
diff --git a/xapian-core/backends/honey/honey_table.h b/xapian-core/backends/honey/honey_table.h
index f5481d60b..9d65aed80 100644
--- a/xapian-core/backends/honey/honey_table.h
+++ b/xapian-core/backends/honey/honey_table.h
@@ -31,7 +31,9 @@
 #include "xapian/error.h"
 
 #include <algorithm>
-#include<iostream> // FIXME
+#if 0
+#include <iostream> // FIXME
+#endif
 
 #include <cstdio> // For EOF
 #include <cstdlib> // std::abort()
-- 
2.11.4.GIT