>From 78e57294e2e7da741c47f31ba6c17b7fb6219c87 Mon Sep 17 00:00:00 2001
From: Tino Mettler <tino+debian@tikei.de>
Date: Wed, 6 Jul 2016 14:33:19 +0200
Subject: [PATCH] Fix implicit shared_ptr conversions

---
 src/dbus/server/session.h    | 2 +-
 src/syncevo/Logging.h        | 4 ++--
 src/syncevo/StringDataBlob.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/dbus/server/session.h b/src/dbus/server/session.h
index af46f5d..b762bab 100644
--- a/src/dbus/server/session.h
+++ b/src/dbus/server/session.h
@@ -425,7 +425,7 @@ public:
     void setServerAlerted(bool serverAlerted) { m_serverAlerted = serverAlerted; }
 
     void initServer(SharedBuffer data, const std::string &messageType);
-    void setStubConnection(const boost::shared_ptr<Connection> c) { m_connection = c; m_useConnection = c; }
+    void setStubConnection(const boost::shared_ptr<Connection> c) { m_connection = c; m_useConnection = static_cast<bool> (c); }
     boost::weak_ptr<Connection> getStubConnection() { return m_connection; }
     bool useStubConnection() { return m_useConnection; }
 
diff --git a/src/syncevo/Logging.h b/src/syncevo/Logging.h
index ce9a249..5deb01b 100644
--- a/src/syncevo/Logging.h
+++ b/src/syncevo/Logging.h
@@ -255,7 +255,7 @@ class Logger
         Handle &operator = (const Handle &other) throw ();
         ~Handle() throw ();
 
-        operator bool () const { return m_logger; }
+        operator bool () const { return static_cast<bool> (m_logger); }
         bool operator == (Logger *logger) const { return m_logger.get() == logger; }
         Logger *get() const { return m_logger.get(); }
 
@@ -398,7 +398,7 @@ template<class L> class PushLogger : boost::noncopyable
         }
     }
 
-    operator bool () const { return m_logger; }
+    operator bool () const { return static_cast<bool> (m_logger); }
 
     void reset(const Logger::Handle &logger)
     {
diff --git a/src/syncevo/StringDataBlob.h b/src/syncevo/StringDataBlob.h
index 62bc4c7..14f0d61 100644
--- a/src/syncevo/StringDataBlob.h
+++ b/src/syncevo/StringDataBlob.h
@@ -53,7 +53,7 @@ class StringDataBlob : public DataBlob
 
     virtual boost::shared_ptr<std::string> getData() { return m_data; }
     virtual std::string getName() const { return m_name; }
-    virtual bool exists() const { return m_data; }
+    virtual bool exists() const { return static_cast<bool> (m_data); }
     virtual bool isReadonly() const { return m_readonly; }
 };