Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2014-08-21 08:38:11 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2014-08-21 08:40:10 (GMT) |
| commit | 381b22fc365c27b9cd585f4b78f53ebc698d9f54 (patch) | |
| tree | 0ffd89a8be13293c75c7ddfea524c74e0bf87b72 /Swiften/Client | |
| parent | 8ec22a9c5591584fd1725ed028d714c51b7509d3 (diff) | |
| download | swift-381b22fc365c27b9cd585f4b78f53ebc698d9f54.zip swift-381b22fc365c27b9cd585f4b78f53ebc698d9f54.tar.bz2 | |
Clean up compilation errors in Swiften due to boost 1.56
Can no longer implicitly convert boost::optional to bool temporaries. Also fixed assorted uses of cerr where logging was appropriate.
Test-Information:
Swiften compiles against boost 1.56 (link fails for me so far)
Change-Id: Iec058af933a82a987da64291435a475f8b40ef96
Diffstat (limited to 'Swiften/Client')
| -rw-r--r-- | Swiften/Client/ClientSession.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp index 441189e..500299a 100644 --- a/Swiften/Client/ClientSession.cpp +++ b/Swiften/Client/ClientSession.cpp @@ -44,7 +44,6 @@ #include <Swiften/Session/SessionStream.h> #include <Swiften/TLS/CertificateTrustChecker.h> #include <Swiften/TLS/ServerIdentityVerifier.h> -#include <Swiften/Base/Log.h> #ifdef SWIFTEN_PLATFORM_WIN32 #include <Swiften/Base/WindowsRegistry.h> @@ -171,11 +170,11 @@ void ClientSession::handleElement(boost::shared_ptr<ToplevelElement> element) { stanzaAckRequester_->handleAckReceived(ack->getHandledStanzasCount()); } else { - std::cerr << "Warning: Got invalid ack from server" << std::endl; + SWIFT_LOG(warning) << "Got invalid ack from server"; } } else { - std::cerr << "Warning: Ignoring ack" << std::endl; + SWIFT_LOG(warning) << "Ignoring ack"; } } else if (StreamError::ref streamError = boost::dynamic_pointer_cast<StreamError>(element)) { |