import ceph quincy 17.2.4

[ceph.git] / ceph / src / include / buffer.h

diff --git a/ceph/src/include/buffer.h b/ceph/src/include/buffer.h
index 0c89367dd3b2c42fc55bee06981a0bb0e0691886..ef4add9d7d8a80a6673d28d902d19b041ac43ada 100644 (file)
--- a/ceph/src/include/buffer.h
+++ b/ceph/src/include/buffer.h
@@ -41,6 +41,7 @@
 #include <iosfwd>
 #include <iomanip>
 #include <list>
+#include <memory>
 #include <vector>
 #include <string>
 #if __cplusplus >= 201703L
@@ -863,7 +864,9 @@ struct error_code;
        if (first_round) {
          impl_f(first_round);
        }
-       if (const auto second_round = len - first_round; second_round) {
+       // no C++17 for the sake of the C++11 guarantees of librados, sorry.
+       const auto second_round = len - first_round;
+       if (second_round) {
          _refill(second_round);
          impl_f(second_round);
        }