Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-09-26 17:32:47 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-09-26 17:32:47 (GMT) |
| commit | 6d527bd8083a16d331199c05a09ff68cb818acf4 (patch) | |
| tree | 4c1ae63efeadc792a34f8c50a5d0508076e648aa | |
| parent | 60823cd43ea17d8e06f3ae4a06f3c92d71fb00e5 (diff) | |
| download | swift-contrib-6d527bd8083a16d331199c05a09ff68cb818acf4.zip swift-contrib-6d527bd8083a16d331199c05a09ff68cb818acf4.tar.bz2 | |
Fixed compilation warnings & errors.
| -rw-r--r-- | Swift/Controllers/FileTransfer/FileTransferController.h | 1 | ||||
| -rw-r--r-- | Swiften/Client/ClientSession.cpp | 4 | ||||
| -rw-r--r-- | Swiften/Client/ClientSession.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h index 5d98468..3d6f7d5 100644 --- a/Swift/Controllers/FileTransfer/FileTransferController.h +++ b/Swift/Controllers/FileTransfer/FileTransferController.h @@ -3,18 +3,19 @@ * Licensed under the simplified BSD license. * See Documentation/Licenses/BSD-simplified.txt for more information. */ #pragma once #include <string> #include <boost/shared_ptr.hpp> +#include <boost/cstdint.hpp> #include <Swiften/JID/JID.h> #include <Swiften/FileTransfer/FileTransfer.h> #include <Swiften/FileTransfer/IncomingFileTransfer.h> #include <Swiften/FileTransfer/FileReadBytestream.h> #include <Swiften/FileTransfer/FileWriteBytestream.h> #include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h> namespace Swift { diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp index 275f913..791ee75 100644 --- a/Swiften/Client/ClientSession.cpp +++ b/Swiften/Client/ClientSession.cpp @@ -46,25 +46,25 @@ namespace Swift { ClientSession::ClientSession( const JID& jid, boost::shared_ptr<SessionStream> stream) : localJID(jid), state(Initial), stream(stream), allowPLAINOverNonTLS(false), useStreamCompression(true), useTLS(UseTLSWhenAvailable), + useAcks(true), needSessionStart(false), needResourceBind(false), needAcking(false), rosterVersioningSupported(false), authenticator(NULL), - certificateTrustChecker(NULL), - useAcks(true) { + certificateTrustChecker(NULL) { } ClientSession::~ClientSession() { } void ClientSession::start() { stream->onStreamStartReceived.connect(boost::bind(&ClientSession::handleStreamStart, shared_from_this(), _1)); stream->onElementReceived.connect(boost::bind(&ClientSession::handleElement, shared_from_this(), _1)); stream->onClosed.connect(boost::bind(&ClientSession::handleStreamClosed, shared_from_this(), _1)); diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h index 939e96e..2205c8d 100644 --- a/Swiften/Client/ClientSession.h +++ b/Swiften/Client/ClientSession.h @@ -153,21 +153,21 @@ namespace Swift { void checkTrustOrFinish(Certificate::ref certificate, boost::shared_ptr<CertificateVerificationError> error); private: JID localJID; State state; boost::shared_ptr<SessionStream> stream; bool allowPLAINOverNonTLS; bool useStreamCompression; UseTLS useTLS; + bool useAcks; bool needSessionStart; bool needResourceBind; bool needAcking; bool rosterVersioningSupported; - bool useAcks; ClientAuthenticator* authenticator; boost::shared_ptr<StanzaAckRequester> stanzaAckRequester_; boost::shared_ptr<StanzaAckResponder> stanzaAckResponder_; boost::shared_ptr<Swift::Error> error_; CertificateTrustChecker* certificateTrustChecker; }; } |