From 85717394c33137eb703a7b88608ec9cf3287f67a Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@redhat.com>
Date: Thu, 29 Jan 2015 10:15:02 -0700
Subject: [PATCH] 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>
---
 src/common/map_cacher.hpp | 2 +-
 src/include/encoding.h    | 2 +-
 src/os/DBObjectMap.h      | 2 +-
 src/osd/ECBackend.cc      | 2 +-
 src/osd/ECBackend.h       | 2 +-
 src/osd/ECTransaction.cc  | 2 +-
 src/osd/ECTransaction.h   | 2 +-
 src/osd/ReplicatedPG.h    | 2 +-
 src/osd/osd_types.h       | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/common/map_cacher.hpp b/src/common/map_cacher.hpp
index 101a0be96d92..652d0a26e3c4 100644
--- 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 4fa2331cccb4..d72a7674c9be 100644
--- 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 8e6f0d63a761..de80d6f547cc 100644
--- 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 817cda00f02b..3248de8d56e9 100644
--- 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 d13d8bb48575..01c7a2e9fc6c 100644
--- 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 bad02653ddd4..0a2af7d9bd77 100644
--- 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 e0a3afa6b4af..1404b93a73b9 100644
--- 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 0b0adf5e53cd..aa850408b118 100644
--- 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 10728fa6c60c..8c67a62c11cf 100644
--- 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"
 
-- 
2.47.3