From fe1fa9dc5d7e32fd97a3e82cb07741089b0268ea Mon Sep 17 00:00:00 2001
From: "Adam C. Emerson" <aemerson@redhat.com>
Date: Thu, 28 Mar 2019 21:04:07 -0400
Subject: [PATCH] include: Update fs_types.h to work without using namespace

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
---
 src/include/fs_types.h | 39 +++++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/include/fs_types.h b/src/include/fs_types.h
index 2132db9aac7..091f39f4b66 100644
--- a/src/include/fs_types.h
+++ b/src/include/fs_types.h
@@ -18,11 +18,11 @@ struct inodeno_t {
   inodeno_t operator+=(inodeno_t o) { val += o.val; return *this; }
   operator _inodeno_t() const { return val; }
 
-  void encode(bufferlist& bl) const {
+  void encode(ceph::buffer::list& bl) const {
     using ceph::encode;
     encode(val, bl);
   }
-  void decode(bufferlist::const_iterator& p) {
+  void decode(ceph::buffer::list::const_iterator& p) {
     using ceph::decode;
     decode(val, p);
   }
@@ -38,27 +38,26 @@ struct denc_traits<inodeno_t> {
   static void bound_encode(const inodeno_t &o, size_t& p) {
     denc(o.val, p);
   }
-  static void encode(const inodeno_t &o, buffer::list::contiguous_appender& p) {
+  static void encode(const inodeno_t &o, ceph::buffer::list::contiguous_appender& p) {
     denc(o.val, p);
   }
-  static void decode(inodeno_t& o, buffer::ptr::const_iterator &p) {
+  static void decode(inodeno_t& o, ceph::buffer::ptr::const_iterator &p) {
     denc(o.val, p);
   }
 };
 
-inline ostream& operator<<(ostream& out, const inodeno_t& ino) {
-  return out << hex << "0x" << ino.val << dec;
+inline std::ostream& operator<<(std::ostream& out, const inodeno_t& ino) {
+  return out << std::hex << "0x" << ino.val << std::dec;
 }
 
 namespace std {
-  template<> struct hash< inodeno_t >
-  {
-    size_t operator()( const inodeno_t& x ) const
-    {
-      static rjhash<uint64_t> H;
-      return H(x.val);
-    }
-  };
+template<>
+struct hash<inodeno_t> {
+  size_t operator()( const inodeno_t& x ) const {
+    static rjhash<uint64_t> H;
+    return H(x.val);
+  }
+};
 } // namespace std
 
 
@@ -90,7 +89,7 @@ struct file_layout_t {
   uint32_t object_size;   ///< until objects are this big
 
   int64_t pool_id;        ///< rados pool id
-  string pool_ns;         ///< rados pool namespace
+  std::string pool_ns;         ///< rados pool namespace
 
   file_layout_t(uint32_t su=0, uint32_t sc=0, uint32_t os=0)
     : stripe_unit(su),
@@ -112,15 +111,15 @@ struct file_layout_t {
 
   bool is_valid() const;
 
-  void encode(bufferlist& bl, uint64_t features) const;
-  void decode(bufferlist::const_iterator& p);
-  void dump(Formatter *f) const;
-  static void generate_test_instances(list<file_layout_t*>& o);
+  void encode(ceph::buffer::list& bl, uint64_t features) const;
+  void decode(ceph::buffer::list::const_iterator& p);
+  void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<file_layout_t*>& o);
 };
 WRITE_CLASS_ENCODER_FEATURES(file_layout_t)
 
 WRITE_EQ_OPERATORS_5(file_layout_t, stripe_unit, stripe_count, object_size, pool_id, pool_ns);
 
-ostream& operator<<(ostream& out, const file_layout_t &layout);
+std::ostream& operator<<(std::ostream& out, const file_layout_t &layout);
 
 #endif
-- 
2.39.5