summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-12-31 15:29:38 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-12-31 18:49:02 (GMT)
commit6cedffb9368eeb05e199f7df80c4735f63735a94 (patch)
tree4131780d3d4d97e69651a5b3735bb1b6e23c54bc /Swiften/Network
parentd8bc52bffd7ef7750afec20f0443276ba4579267 (diff)
downloadswift-6cedffb9368eeb05e199f7df80c4735f63735a94.zip
swift-6cedffb9368eeb05e199f7df80c4735f63735a94.tar.bz2
Fix more warnings.
Change-Id: I0fc27a08adb6aecd5c5775a52b7fe48570ed526a
Diffstat (limited to 'Swiften/Network')
-rw-r--r--Swiften/Network/BOSHConnection.cpp6
-rw-r--r--Swiften/Network/TLSConnection.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/Swiften/Network/BOSHConnection.cpp b/Swiften/Network/BOSHConnection.cpp
index be4360e..23772eb 100644
--- a/Swiften/Network/BOSHConnection.cpp
+++ b/Swiften/Network/BOSHConnection.cpp
@@ -110,7 +110,7 @@ std::pair<SafeByteArray, size_t> BOSHConnection::createHTTPRequest(const SafeByt
header << ":" << *boshURL.getPort();
}
header << "\r\n"
- /*<< "Accept-Encoding: deflate\r\n"*/
+ // << "Accept-Encoding: deflate\r\n"
<< "Content-Type: text/xml; charset=utf-8\r\n"
<< "Content-Length: " << size << "\r\n\r\n";
@@ -156,7 +156,7 @@ void BOSHConnection::startStream(const std::string& to, unsigned long long rid)
<< " rid='" << rid << "'"
<< " ver='1.6'"
<< " wait='60'" /* FIXME: we probably want this configurable*/
- /*<< " ack='0'" FIXME: support acks */
+ // << " ack='0'" FIXME: support acks
<< " xml:lang='en'"
<< " xmlns:xmpp='urn:xmpp:bosh'"
<< " xmpp:version='1.0'"
@@ -170,7 +170,7 @@ void BOSHConnection::startStream(const std::string& to, unsigned long long rid)
header << ":" << *boshURL_.getPort();
}
header << "\r\n"
- /*<< "Accept-Encoding: deflate\r\n"*/
+ // << "Accept-Encoding: deflate\r\n"
<< "Content-Type: text/xml; charset=utf-8\r\n"
<< "Content-Length: " << contentString.size() << "\r\n\r\n"
<< contentString;
diff --git a/Swiften/Network/TLSConnection.h b/Swiften/Network/TLSConnection.h
index a798393..60f73ea 100644
--- a/Swiften/Network/TLSConnection.h
+++ b/Swiften/Network/TLSConnection.h
@@ -24,7 +24,7 @@ namespace Swift {
TLSConnection(Connection::ref connection, TLSContextFactory* tlsFactory);
virtual ~TLSConnection();
- virtual void listen() {assert(false);};
+ virtual void listen() {assert(false);}
virtual void connect(const HostAddressPort& address);
virtual void disconnect();
virtual void write(const SafeByteArray& data);