From: Radoslaw Zarzynski Date: Sat, 15 Feb 2020 12:19:09 +0000 (+0100) Subject: common, include: bump the version of ceph::buffer's C++ API. X-Git-Tag: v15.1.1~180^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=205e993b983cd11eb7f3d8b4160d1c44a98ccf59;p=ceph.git common, include: bump the version of ceph::buffer's C++ API. Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/common/buffer_seastar.cc b/src/common/buffer_seastar.cc index 0d4b0fd9960a9..f1e1484eeef07 100644 --- a/src/common/buffer_seastar.cc +++ b/src/common/buffer_seastar.cc @@ -41,7 +41,7 @@ class raw_seastar_local_ptr : public raw { } }; -inline namespace v14_2_0 { +inline namespace v15_2_0 { ceph::unique_leakable_ptr create_foreign(temporary_buffer&& buf) { return ceph::unique_leakable_ptr( @@ -53,7 +53,7 @@ ceph::unique_leakable_ptr create(temporary_buffer&& buf) { new raw_seastar_local_ptr(std::move(buf))); } -} // inline namespace v14_2_0 +} // inline namespace v15_2_0 // buffer::ptr conversions diff --git a/src/include/buffer.h b/src/include/buffer.h index e0b2a4011e1f1..323f91da5c7e5 100644 --- a/src/include/buffer.h +++ b/src/include/buffer.h @@ -99,7 +99,7 @@ struct unique_leakable_ptr : public std::unique_ptr> { }; namespace buffer CEPH_BUFFER_API { -inline namespace v14_2_0 { +inline namespace v15_2_0 { /* * exceptions @@ -1200,7 +1200,7 @@ inline namespace v14_2_0 { static list static_from_string(std::string& s); }; -} // inline namespace v14_2_0 +} // inline namespace v15_2_0 /* * efficient hash of one or more bufferlists diff --git a/src/include/buffer_fwd.h b/src/include/buffer_fwd.h index 7fac596305333..6de7b1a1ff56c 100644 --- a/src/include/buffer_fwd.h +++ b/src/include/buffer_fwd.h @@ -3,7 +3,7 @@ namespace ceph { namespace buffer { - inline namespace v14_2_0 { + inline namespace v15_2_0 { class ptr; class list; } diff --git a/src/include/buffer_raw.h b/src/include/buffer_raw.h index db41fc0212970..6483edd73f96d 100644 --- a/src/include/buffer_raw.h +++ b/src/include/buffer_raw.h @@ -24,7 +24,7 @@ #include "include/spinlock.h" namespace ceph::buffer { -inline namespace v14_2_0 { +inline namespace v15_2_0 { class raw { public: @@ -115,7 +115,7 @@ public: } }; -} // inline namespace v14_2_0 +} // inline namespace v15_2_0 } // namespace ceph::buffer #endif // CEPH_BUFFER_RAW_H diff --git a/src/librados/librados.map b/src/librados/librados.map index 0567de1727db4..b7552be61113f 100644 --- a/src/librados/librados.map +++ b/src/librados/librados.map @@ -5,7 +5,7 @@ LIBRADOS_PRIVATE { LIBRADOS_14.2.0 { global: extern "C++" { - ceph::buffer::v14_2_0::*; + ceph::buffer::v15_2_0::*; librados::v14_2_0::*; "typeinfo for librados::v14_2_0::ObjectOperation";