journal: updates to support C++11

Signed-off-by: Jason Dillaman <dillaman@redhat.com>

diff --git a/src/journal/Future.h b/src/journal/Future.h
index dbc7d4d687766edf3bb392478c8e893cd542946a..1ddb606563282e8c6e3b74e0d297936c238401af 100644 (file)
--- a/src/journal/Future.h
+++ b/src/journal/Future.h
@@ -24,7 +24,7 @@ public:
   Future(const FutureImplPtr &future_impl) : m_future_impl(future_impl) {}
 
   inline bool is_valid() const {
-    return m_future_impl;
+    return m_future_impl.get() != nullptr;
   }
 
   void flush(Context *on_safe);

diff --git a/src/journal/ObjectPlayer.h b/src/journal/ObjectPlayer.h
index 5c00ba1c056228ed5cd1cad33118765a50a1616b..5fb9c2723158251f7aa222b20c8400e0f01f7ac8 100644 (file)
--- a/src/journal/ObjectPlayer.h
+++ b/src/journal/ObjectPlayer.h
@@ -5,7 +5,6 @@
 #define CEPH_JOURNAL_OBJECT_PLAYER_H
 
 #include "include/Context.h"
-#include "include/hash_namespace.h"
 #include "include/interval_set.h"
 #include "include/rados/librados.hpp"
 #include "common/Cond.h"