From: Jason Dillaman <dillaman@redhat.com>
Date: Thu, 20 Aug 2015 01:57:41 +0000 (-0400)
Subject: journal: updates to support C++11
X-Git-Tag: v10.0.1~102^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3f3be145d8fd3f3837a0a3b1e3a983f545abfee6;p=ceph.git

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 dbc7d4d68776..1ddb60656328 100644
--- 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 5c00ba1c0562..5fb9c2723158 100644
--- 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"