update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / seastar / include / seastar / core / deleter.hh

diff --git a/ceph/src/seastar/include/seastar/core/deleter.hh b/ceph/src/seastar/include/seastar/core/deleter.hh
index b3236e493b10c5f02e29a39281519f93da2bb079..b637336e1a1e935bc726e8e4d5a2dfdf8d2ae3a6 100644 (file)
--- a/ceph/src/seastar/include/seastar/core/deleter.hh
+++ b/ceph/src/seastar/include/seastar/core/deleter.hh
@@ -55,13 +55,13 @@ private:
     impl* _impl = nullptr;
 public:
     /// Constructs an empty deleter that does nothing in its destructor.
-    deleter() = default;
+    deleter() noexcept = default;
     deleter(const deleter&) = delete;
     /// Moves a deleter.
     deleter(deleter&& x) noexcept : _impl(x._impl) { x._impl = nullptr; }
     /// \cond internal
-    explicit deleter(impl* i) : _impl(i) {}
-    deleter(raw_object_tag tag, void* object)
+    explicit deleter(impl* i) noexcept : _impl(i) {}
+    deleter(raw_object_tag tag, void* object) noexcept
         : _impl(from_raw_object(object)) {}
     /// \endcond
     /// Destroys the deleter and carries out the encapsulated action.
@@ -75,7 +75,7 @@ public:
     /// \return a deleter with the same encapsulated action as this one.
     deleter share();
     /// Checks whether the deleter has an associated action.
-    explicit operator bool() const { return bool(_impl); }
+    explicit operator bool() const noexcept { return bool(_impl); }
     /// \cond internal
     void reset(impl* i) {
         this->~deleter();
@@ -86,21 +86,21 @@ public:
     /// destroyed, both encapsulated actions will be carried out.
     void append(deleter d);
 private:
-    static bool is_raw_object(impl* i) {
+    static bool is_raw_object(impl* i) noexcept {
         auto x = reinterpret_cast<uintptr_t>(i);
         return x & 1;
     }
-    bool is_raw_object() const {
+    bool is_raw_object() const noexcept {
         return is_raw_object(_impl);
     }
-    static void* to_raw_object(impl* i) {
+    static void* to_raw_object(impl* i) noexcept {
         auto x = reinterpret_cast<uintptr_t>(i);
         return reinterpret_cast<void*>(x & ~uintptr_t(1));
     }
-    void* to_raw_object() const {
+    void* to_raw_object() const noexcept {
         return to_raw_object(_impl);
     }
-    impl* from_raw_object(void* object) {
+    impl* from_raw_object(void* object) noexcept {
         auto x = reinterpret_cast<uintptr_t>(object);
         return reinterpret_cast<impl*>(x | 1);
     }
@@ -162,7 +162,7 @@ object_deleter_impl<Object>* make_object_deleter_impl(deleter next, Object obj)
 /// destroying an object, as well as running another deleter.  The input
 /// object is moved to the deleter, and destroyed when the deleter is destroyed.
 ///
-/// \param d deleter that will become part of the new deleter's encapsulated action
+/// \param next deleter that will become part of the new deleter's encapsulated action
 /// \param o object whose destructor becomes part of the new deleter's encapsulated action
 /// \related deleter
 template <typename Object>
@@ -249,7 +249,7 @@ make_free_deleter(void* obj) {
 /// Makes a deleter that calls \c std::free() when it is destroyed, as well
 /// as invoking the encapsulated action of another deleter.
 ///
-/// \param d deleter to invoke.
+/// \param next deleter to invoke.
 /// \param obj object to free.
 /// \related deleter
 inline