Merge branch 'v0.7-devel' into 2016-14-08-cache-format2

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;

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] $@"

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;
@@ -13,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));
 }