]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd: fix the FTBFS on old boost introduced by 2050d08 5634/head
authorKefu Chai <kchai@redhat.com>
Fri, 21 Aug 2015 13:40:59 +0000 (21:40 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 21 Aug 2015 13:41:01 +0000 (21:41 +0800)
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>
src/rbd.cc

index 72f81df7e631743c22e9bf53913bbe97a1cdb9a3..bbcea0063523c2316297f5444fe5c0c379b9e33d 100755 (executable)
@@ -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);