From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Mon, 20 Jun 2016 13:56:50 +0000 (+0200)
Subject: rgw_swift: newer versions of boost/utility no longer include in_place
X-Git-Tag: v10.2.3~75^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3250c4d5a0bd9fc32eb6b1831a38363581f7c1bd;p=ceph.git

rgw_swift: newer versions of boost/utility no longer include in_place

boost > 1.58 no longer includes in_place in boost/utility, we need to
include in_place_factory explicitly. This causes build failures in
distros that ship with a higher version of boost. Since the only call is for
swift_ver_location, another possibility is to use emplace()
instead (though this requires boost ~ 1.56)

Fixes: http://tracker.ceph.com/issues/16391
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit a14f0f3869bb7defa7587ad9ccb18c3f086b2c3d)

Conflicts:
	src/rgw/rgw_rest_swift.cc
	    jewel does not have #include <boost/optional.hpp>
---

diff --git a/src/rgw/rgw_rest_swift.cc b/src/rgw/rgw_rest_swift.cc
index a9bf03e7ff0..52e280dbc75 100644
--- a/src/rgw/rgw_rest_swift.cc
+++ b/src/rgw/rgw_rest_swift.cc
@@ -1,6 +1,8 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include <boost/utility/in_place_factory.hpp>
+
 #include "include/assert.h"
 
 #include "common/Formatter.h"