update sources to v12.1.0

[ceph.git] / ceph / src / common / shared_cache.hpp

diff --git a/ceph/src/common/shared_cache.hpp b/ceph/src/common/shared_cache.hpp
index 8ff949084a6ebd7713841a02b69da3088363a24b..3332bd4f00ac0d171ddf7f15780727a78375edcd 100644 (file)
--- a/ceph/src/common/shared_cache.hpp
+++ b/ceph/src/common/shared_cache.hpp
@@ -17,12 +17,13 @@
 
 #include <map>
 #include <list>
-#include <memory>
-#include <utility>
 #include "common/Mutex.h"
 #include "common/Cond.h"
 #include "include/unordered_map.h"
 
+// re-include our assert to clobber the system one; fix dout:
+#include "include/assert.h"
+
 template <class K, class V, class C = std::less<K>, class H = std::hash<K> >
 class SharedLRU {
   CephContext *cct;