support Boost 1.57.0

Sometime after 1.55, boost introduced a forward declaration of
operator<< in optional.hpp. In 1.55 and earlier, when << was used
without the _io having been included, what got dumped was an implicit
bool conversion.

http://tracker.ceph.com/issues/10688 Refs: #10688
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

diff --git a/src/common/map_cacher.hpp b/src/common/map_cacher.hpp
index 101a0be96d927f4c596b004ca001f124cfc85926..652d0a26e3c4e6db7aaadee2c6957926ce1b4ff4 100644 (file)
--- a/src/common/map_cacher.hpp
+++ b/src/common/map_cacher.hpp
@@ -16,7 +16,7 @@
 #define MAPCACHER_H
 
 #include <boost/scoped_ptr.hpp>
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include "include/memory.h"
 #include <set>
 #include <map>

diff --git a/src/include/encoding.h b/src/include/encoding.h
index 4fa2331cccb4321001c6fae3b262a2f5e4e0d72e..d72a7674c9be9d025fe4039ccd813d30b480ccbf 100644 (file)
--- a/src/include/encoding.h
+++ b/src/include/encoding.h
@@ -286,7 +286,7 @@ inline void decode(T &o, bufferlist& bl)
 #include <deque>
 #include <vector>
 #include <string>
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #ifndef _BACKWARD_BACKWARD_WARNING_H

diff --git a/src/os/DBObjectMap.h b/src/os/DBObjectMap.h
index 8e6f0d63a76150a11b9962d629954952aea58e37..de80d6f547ccc90df4acbde33cd43b3a0591ef25 100644 (file)
--- a/src/os/DBObjectMap.h
+++ b/src/os/DBObjectMap.h
@@ -17,7 +17,7 @@
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "common/simple_cache.hpp"
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 
 /**
  * DBObjectMap: Implements ObjectMap in terms of KeyValueDB

diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
index 817cda00f02b6e592a40e9ccbcc1f92aea8b9eb3..3248de8d56e90b77b6e066c7406d2e3adeaaecee 100644 (file)
--- a/src/osd/ECBackend.cc
+++ b/src/osd/ECBackend.cc
@@ -13,7 +13,7 @@
  */
 
 #include <boost/variant.hpp>
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include <iostream>
 #include <sstream>
 

diff --git a/src/osd/ECBackend.h b/src/osd/ECBackend.h
index d13d8bb4857556c0eafb3747c47e4e45f3ba9d28..01c7a2e9fc6c459b4815c7e670c7425043cdeaed 100644 (file)
--- a/src/osd/ECBackend.h
+++ b/src/osd/ECBackend.h
@@ -18,7 +18,7 @@
 #include "OSD.h"
 #include "PGBackend.h"
 #include "osd_types.h"
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include "erasure-code/ErasureCodeInterface.h"
 #include "ECTransaction.h"
 #include "ECMsgTypes.h"

diff --git a/src/osd/ECTransaction.cc b/src/osd/ECTransaction.cc
index bad02653ddd4751286da49dfc474252894b361cd..0a2af7d9bd77457f664465647cdcfa9758a5a266 100644 (file)
--- a/src/osd/ECTransaction.cc
+++ b/src/osd/ECTransaction.cc
@@ -13,7 +13,7 @@
  */
 
 #include <boost/variant.hpp>
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include <iostream>
 #include <vector>
 #include <sstream>

diff --git a/src/osd/ECTransaction.h b/src/osd/ECTransaction.h
index e0a3afa6b4af53630c17d2962f29335ddf2cf804..1404b93a73b95759c68627193125235fb404d587 100644 (file)
--- a/src/osd/ECTransaction.h
+++ b/src/osd/ECTransaction.h
@@ -19,7 +19,7 @@
 #include "PGBackend.h"
 #include "osd_types.h"
 #include "ECUtil.h"
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include "erasure-code/ErasureCodeInterface.h"
 
 class ECTransaction : public PGBackend::PGTransaction {

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 0b0adf5e53cd9b7b69f5b03b674de9993f3b375f..aa850408b118c423793bdeefed63351e293e255b 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -17,7 +17,7 @@
 #ifndef CEPH_REPLICATEDPG_H
 #define CEPH_REPLICATEDPG_H
 
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 #include <boost/tuple/tuple.hpp>
 
 #include "include/assert.h" 

diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index 10728fa6c60ca3971d67b8d3233fafea32c9eeac..8c67a62c11cf045485fc310fe44598e437aae1ba 100644 (file)
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <memory>
 #include <boost/scoped_ptr.hpp>
-#include <boost/optional.hpp>
+#include <boost/optional/optional_io.hpp>
 
 #include "include/rados/rados_types.hpp"