update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / librbd / watcher / Types.h

diff --git a/ceph/src/librbd/watcher/Types.h b/ceph/src/librbd/watcher/Types.h
index e7886f6cad5e77869939528ec7b4a49c8e91cbd6..d1517fb0f5d887c72b551ee5d8d90c0819b51009 100644 (file)
--- a/ceph/src/librbd/watcher/Types.h
+++ b/ceph/src/librbd/watcher/Types.h
@@ -24,7 +24,7 @@ struct ClientId {
   ClientId(uint64_t gid, uint64_t handle) : gid(gid), handle(handle) {}
 
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& it);
+  void decode(bufferlist::const_iterator& it);
   void dump(Formatter *f) const;
 
   inline bool is_valid() const {
@@ -51,7 +51,7 @@ struct NotifyResponse {
   std::vector<ClientId> timeouts;
 
   void encode(bufferlist& bl) const;
-  void decode(bufferlist::iterator& it);
+  void decode(bufferlist::const_iterator& it);
 };
 
 template <typename ImageCtxT>
@@ -59,13 +59,13 @@ struct Traits {
   typedef librbd::Watcher Watcher;
 };
 
-} // namespace watcher
-} // namespace librbd
-
 std::ostream &operator<<(std::ostream &out,
-                         const librbd::watcher::ClientId &client);
+                         const ClientId &client);
 
-WRITE_CLASS_ENCODER(librbd::watcher::ClientId);
-WRITE_CLASS_ENCODER(librbd::watcher::NotifyResponse);
+WRITE_CLASS_ENCODER(ClientId);
+WRITE_CLASS_ENCODER(NotifyResponse);
+
+} // namespace watcher
+} // namespace librbd
 
 #endif // CEPH_LIBRBD_WATCHER_TYPES_H