From 78d5afde4334e422cb8b915148ca3fc9f819570a Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sat, 28 Oct 2017 15:56:35 -0500
Subject: [PATCH] include/btree_map: clean up wrapper header around btree_map

Signed-off-by: Sage Weil <sage@redhat.com>
---
 src/include/btree_interval_set.h              | 4 +---
 src/include/{encoding_btree.h => btree_map.h} | 7 +++++--
 src/kv/MemDB.h                                | 4 +---
 src/osd/OSDMap.h                              | 3 +--
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename src/include/{encoding_btree.h => btree_map.h} (87%)

diff --git a/src/include/btree_interval_set.h b/src/include/btree_interval_set.h
index c0c35e1a28110..cf8b2cd135395 100644
--- 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/encoding_btree.h b/src/include/btree_map.h
similarity index 87%
rename from src/include/encoding_btree.h
rename to src/include/btree_map.h
index 19faf4b838962..508aa3914e7eb 100644
--- a/src/include/encoding_btree.h
+++ b/src/include/btree_map.h
@@ -1,10 +1,13 @@
 // -*- 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
+#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)
diff --git a/src/kv/MemDB.h b/src/kv/MemDB.h
index dcdcb3abbf1e5..cc19da21e2706 100644
--- 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 2fc2f1617454a..557c8bdcb693b 100644
--- 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
-- 
2.39.5