2 files changed, 6 insertions, 2 deletions
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 6ef624e..4b944fc 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.h
@@ -95,5 +95,7 @@ namespace Swift {
 
 			bool getStreamManagementEnabled() const {
-				return stanzaAckRequester_;
+				// Explicitly convert to bool. In C++11, it would be cleaner to
+				// compare to nullptr.
+				return static_cast<bool>(stanzaAckRequester_);
 			}
 
diff --git a/Swiften/Elements/Message.h b/Swiften/Elements/Message.h
index 3b9145c..ea99814 100644
--- a/Swiften/Elements/Message.h
+++ b/Swiften/Elements/Message.h
@@ -39,6 +39,8 @@ namespace Swift {
 			}
 
+			// Explicitly convert to bool. In C++11, it would be cleaner to
+			// compare to nullptr.
 			bool hasSubject() {
-				return getPayload<Subject>();
+				return static_cast<bool>(getPayload<Subject>());
 			}