From 0c78d8d0c563856d2a5c1062e5517f7e731c0e1e Mon Sep 17 00:00:00 2001
From: Thanos Makatos <thanos.makatos@onapp.com>
Date: Wed, 7 Sep 2016 13:16:32 +0000
Subject: [PATCH 1/2] fix compilation for gcc 5.4.0

---
 caching/cache_writeback.cc                  | 1 +
 contrib/Makefile.in                         | 2 +-
 thin-provisioning/static_library_emitter.cc | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/caching/cache_writeback.cc b/caching/cache_writeback.cc
index 7dbf4c3..be7a9a7 100644
--- a/caching/cache_writeback.cc
+++ b/caching/cache_writeback.cc
@@ -10,6 +10,7 @@
 #include <getopt.h>
 #include <string>
 #include <stdexcept>
+#include <boost/optional/optional_io.hpp>
 
 using namespace bcache;
 using namespace caching;
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 0b6c28f..c093ca7 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -12,7 +12,7 @@ contrib: $(PLUGINS) $(PLUGIN_LIBS)
 
 contrib/%.o: contrib/%.cc
 	$(V)echo "    [CC] $@"
-	$(V)$(CC) $^ -o $@
+	$(V)$(CXX) $(INCLUDES) $(CXXFLAGS) $^ -c -o $@
 
 contrib/%.a: contrib/%.o
 	$(V)echo "    [AR] $@"
diff --git a/thin-provisioning/static_library_emitter.cc b/thin-provisioning/static_library_emitter.cc
index 8caa507..184a458 100644
--- a/thin-provisioning/static_library_emitter.cc
+++ b/thin-provisioning/static_library_emitter.cc
@@ -1,6 +1,7 @@
 #include "thin-provisioning/shared_library_emitter.h"
 #include <stdexcept>
 #include "contrib/tmakatos_emitter.h"
+#include <iostream>
 
 using namespace std;
 using namespace thin_provisioning;

From 73e583e662af5bfb8817486209093e4ea764c871 Mon Sep 17 00:00:00 2001
From: Thanos Makatos <thanos.makatos@onapp.com>
Date: Mon, 6 Feb 2017 13:11:10 +0300
Subject: [PATCH 2/2] remove debug print

---
 thin-provisioning/static_library_emitter.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/thin-provisioning/static_library_emitter.cc b/thin-provisioning/static_library_emitter.cc
index 184a458..973ec17 100644
--- a/thin-provisioning/static_library_emitter.cc
+++ b/thin-provisioning/static_library_emitter.cc
@@ -14,9 +14,6 @@ thin_provisioning::create_custom_emitter(string const &shared_lib, ostream &out)
 	if (shared_lib != "tmakatos_emitter.so")
 		throw runtime_error(shared_lib + ": no such emitter");
 
-	cout << "XXX creating tmakatos_emitter" << endl;
-	cout << flush;
-
 	return emitter::ptr(new tmakatos_emitter::binary_emitter(out));
 }