From 1303fb9da8b46febd45032fcc7c52f389527bc5d Mon Sep 17 00:00:00 2001
From: Zygo Blaxell <bees@furryterror.org>
Date: Thu, 24 Nov 2016 22:20:11 -0500
Subject: [PATCH] build: fix FTBFS on GCC 6.2

I'm not surprised that GCC 6 doesn't let me send an ostream ref to itself,
even inside an uninstantiated template specialization.  I am a little
surprised I was trying to, and 4.9 let me get away with it.

It's 2016.  auto_ptr is deprecated now.

Some things were including vector that don't any more.

https://github.com/Zygo/bees/issues/1
---
 include/crucible/cache.h   |  1 +
 include/crucible/chatter.h | 10 ----------
 lib/chatter.cc             |  2 +-
 src/bees-context.cc        |  1 +
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/crucible/cache.h b/include/crucible/cache.h
index a5b9581..dac2a8a 100644
--- a/include/crucible/cache.h
+++ b/include/crucible/cache.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <mutex>
 #include <tuple>
+#include <vector>
 
 namespace crucible {
 	using namespace std;
diff --git a/include/crucible/chatter.h b/include/crucible/chatter.h
index 6486202..d14c80c 100644
--- a/include/crucible/chatter.h
+++ b/include/crucible/chatter.h
@@ -86,16 +86,6 @@ namespace crucible {
 		}
 	};
 
-	template <>
-	struct ChatterTraits<ostream &> {
-		Chatter &
-		operator()(Chatter &c, ostream & arg)
-		{
-			c.get_os() << arg;
-			return c;
-		}
-	};
-
 	class ChatterBox {
 		string m_file;
 		int m_line;
diff --git a/lib/chatter.cc b/lib/chatter.cc
index 2ebe841..c9d187b 100644
--- a/lib/chatter.cc
+++ b/lib/chatter.cc
@@ -15,7 +15,7 @@
 namespace crucible {
 	using namespace std;
 
-	static auto_ptr<set<string>> chatter_names;
+	static shared_ptr<set<string>> chatter_names;
 	static const char *SPACETAB = " \t";
 
 	static
diff --git a/src/bees-context.cc b/src/bees-context.cc
index d4a78c7..932c01a 100644
--- a/src/bees-context.cc
+++ b/src/bees-context.cc
@@ -5,6 +5,7 @@
 
 #include <fstream>
 #include <iostream>
+#include <vector>
 
 using namespace crucible;
 using namespace std;