]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
support Boost 1.57.0
authorPetr Machata <pmachata@redhat.com>
Thu, 29 Jan 2015 17:15:02 +0000 (10:15 -0700)
committerLoic Dachary <ldachary@redhat.com>
Sun, 1 Feb 2015 14:36:01 +0000 (15:36 +0100)
commiteb30631ec3d081fd1bc2cdbd4812a334de9e1282
tree81eadf1faeb41c964168538904d7acf69d6c39b2
parent1ccd73a16e1829b5519ec5b83b2554af173ad052
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>
(cherry picked from commit 85717394c33137eb703a7b88608ec9cf3287f67a)

Conflicts:
src/include/encoding.h
        trivial conflict
src/common/map_cacher.hpp
src/include/encoding.h
src/os/DBObjectMap.h
src/osd/ECBackend.cc
src/osd/ECBackend.h
src/osd/ECTransaction.cc
src/osd/ECTransaction.h
src/osd/ReplicatedPG.h
src/osd/osd_types.h