import quincy beta 17.1.0

[ceph.git] / ceph / src / messages / MMDSResolve.h

diff --git a/ceph/src/messages/MMDSResolve.h b/ceph/src/messages/MMDSResolve.h
index d636bdcd559edf14246944418d7c7c9f6c2c948a..7b4f7c123e5e9e236b936434052d358ac14d0174 100644 (file)
--- a/ceph/src/messages/MMDSResolve.h
+++ b/ceph/src/messages/MMDSResolve.h
@@ -32,7 +32,7 @@ public:
     inodeno_t ino;
     std::map<client_t,Capability::Export> cap_exports;
     peer_inode_cap() {}
-    peer_inode_cap(inodeno_t a, map<client_t, Capability::Export> b) : ino(a), cap_exports(b) {}
+    peer_inode_cap(inodeno_t a, std::map<client_t, Capability::Export> b) : ino(a), cap_exports(b) {}
     void encode(ceph::buffer::list &bl) const 
     {
       ENCODE_START(1, 1, bl);
@@ -148,6 +148,8 @@ public:
 private:
   template<class T, typename... Args>
   friend boost::intrusive_ptr<T> ceph::make_message(Args&&... args);
+  template<class T, typename... Args>
+  friend MURef<T> crimson::make_message(Args&&... args);
 };
 
 inline std::ostream& operator<<(std::ostream& out, const MMDSResolve::peer_request&) {