include/btree_map: clean up wrapper header around btree_map

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 78d5afde4334e422cb8b915148ca3fc9f819570a)

diff --git a/src/include/btree_interval_set.h b/src/include/btree_interval_set.h
index c0c35e1a2811048683647379b57e0fe07b7c7b3e..cf8b2cd13539579e04f706d415850342eb66a21d 100644 (file)
--- a/src/include/btree_interval_set.h
+++ b/src/include/btree_interval_set.h
@@ -29,9 +29,7 @@
 # define MAX(a,b)  ((a)>=(b) ? (a):(b))
 #endif
 
-#include "cpp-btree/btree_map.h"
-#include "assert.h"
-#include "encoding_btree.h"
+#include "btree_map.h"
 
 template<typename T,
         typename Alloc = std::allocator<std::pair<const T, T>>>

diff --git a/src/include/btree_map.h b/src/include/btree_map.h
new file mode 100644 (file)
index 0000000..508aa39
--- /dev/null
+++ b/src/include/btree_map.h
@@ -0,0 +1,63 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#ifndef CEPH_INCLUDE_BTREE_MAP_H
+#define CEPH_INCLUDE_BTREE_MAP_H
+
+#include "include/cpp-btree/btree.h"
+#include "include/cpp-btree/btree_map.h"
+#include "include/assert.h"   // cpp-btree uses system assert, blech
+#include "include/encoding.h"
+
+template<class T, class U>
+inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl)
+{
+  __u32 n = (__u32)(m.size());
+  encode(n, bl);
+  for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
+    encode(p->first, bl);
+    encode(p->second, bl);
+  }
+}
+template<class T, class U>
+inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl, uint64_t features)
+{
+  __u32 n = (__u32)(m.size());
+  encode(n, bl);
+  for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
+    encode(p->first, bl, features);
+    encode(p->second, bl, features);
+  }
+}
+template<class T, class U>
+inline void decode(btree::btree_map<T,U>& m, bufferlist::iterator& p)
+{
+  __u32 n;
+  decode(n, p);
+  m.clear();
+  while (n--) {
+    T k;
+    decode(k, p);
+    decode(m[k], p);
+  }
+}
+template<class T, class U>
+inline void encode_nohead(const btree::btree_map<T,U>& m, bufferlist& bl)
+{
+  for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
+    encode(p->first, bl);
+    encode(p->second, bl);
+  }
+}
+template<class T, class U>
+inline void decode_nohead(int n, btree::btree_map<T,U>& m, bufferlist::iterator& p)
+{
+  m.clear();
+  while (n--) {
+    T k;
+    decode(k, p);
+    decode(m[k], p);
+  }
+}
+
+#endif

diff --git a/src/include/encoding_btree.h b/src/include/encoding_btree.h
deleted file mode 100644 (file)
index 19faf4b..0000000
--- a/src/include/encoding_btree.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
-// vim: ts=8 sw=2 smarttab
-
-#ifndef CEPH_INCLUDE_ENCODING_BTREE_H
-#define CEPH_INCLUDE_ENCODING_BTREE_H
-
-#include "include/cpp-btree/btree_map.h"
-
-template<class T, class U>
-inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl)
-{
-  __u32 n = (__u32)(m.size());
-  encode(n, bl);
-  for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
-    encode(p->first, bl);
-    encode(p->second, bl);
-  }
-}
-template<class T, class U>
-inline void encode(const btree::btree_map<T,U>& m, bufferlist& bl, uint64_t features)
-{
-  __u32 n = (__u32)(m.size());
-  encode(n, bl);
-  for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
-    encode(p->first, bl, features);
-    encode(p->second, bl, features);
-  }
-}
-template<class T, class U>
-inline void decode(btree::btree_map<T,U>& m, bufferlist::iterator& p)
-{
-  __u32 n;
-  decode(n, p);
-  m.clear();
-  while (n--) {
-    T k;
-    decode(k, p);
-    decode(m[k], p);
-  }
-}
-template<class T, class U>
-inline void encode_nohead(const btree::btree_map<T,U>& m, bufferlist& bl)
-{
-  for (typename btree::btree_map<T,U>::const_iterator p = m.begin(); p != m.end(); ++p) {
-    encode(p->first, bl);
-    encode(p->second, bl);
-  }
-}
-template<class T, class U>
-inline void decode_nohead(int n, btree::btree_map<T,U>& m, bufferlist::iterator& p)
-{
-  m.clear();
-  while (n--) {
-    T k;
-    decode(k, p);
-    decode(m[k], p);
-  }
-}
-
-#endif

diff --git a/src/kv/MemDB.h b/src/kv/MemDB.h
index cb2a16b9ba9d98ffb9b30ecd72d4b6b6ca59981d..7bd20e2829583ded8dd48e92b39ca3bbc03180a9 100644 (file)
--- a/src/kv/MemDB.h
+++ b/src/kv/MemDB.h
@@ -17,9 +17,7 @@
 #include "include/memory.h"
 #include <boost/scoped_ptr.hpp>
 #include "include/encoding.h"
-#include "include/cpp-btree/btree.h"
-#include "include/cpp-btree/btree_map.h"
-#include "include/encoding_btree.h"
+#include "include/btree_map.h"
 #include "KeyValueDB.h"
 #include "osd/osd_types.h"
 

diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h
index c75a874c75639e94a4ab256973569be5de99c927..847c7ecb39fa16b72c73aa01f4f4c8bc1d47e6bf 100644 (file)
--- a/src/osd/OSDMap.h
+++ b/src/osd/OSDMap.h
@@ -19,8 +19,6 @@
 #ifndef CEPH_OSDMAP_H
 #define CEPH_OSDMAP_H
 
-#include "include/cpp-btree/btree_map.h"
-
 /*
  * describe properties of the OSD cluster.
  *   disks, disk groups, total # osds,
@@ -36,6 +34,7 @@
 #include <set>
 #include <map>
 #include "include/memory.h"
+#include "include/btree_map.h"
 using namespace std;
 
 // forward declaration