From: Kefu Chai <kchai@redhat.com>
Date: Fri, 21 Aug 2015 13:40:59 +0000 (+0800)
Subject: rbd: fix the FTBFS on old boost introduced by 2050d08
X-Git-Tag: v9.1.0~325^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5634%2Fhead;p=ceph.git

rbd: fix the FTBFS on old boost introduced by 2050d08

in boost 1.49, BOOST_SCOPE_EXIT() does not accept capture_tuple,
only `(capture) (capture) ...` is supported.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/rbd.cc b/src/rbd.cc
index 72f81df7e631..bbcea0063523 100755
--- a/src/rbd.cc
+++ b/src/rbd.cc
@@ -1357,7 +1357,7 @@ static int do_export_diff(librbd::Image& image, const char *fromsnapname,
   if (fd < 0)
     return -errno;
 
-  BOOST_SCOPE_EXIT(&r, &fd, &path) {
+  BOOST_SCOPE_EXIT((&r) (&fd) (&path)) {
     close(fd);
     if (r < 0 && fd != 1) {
       remove(path);