summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-02-12 12:41:02 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-02-12 12:41:02 (GMT)
commite14208b0c3ced126400d6fd031a8d9a92da798c2 (patch)
treed9c013e1b7ed9b5eb7fada544d02b6e67e2135c8
parent24afb2e086b62719fec45a5eeb04a7ba24918220 (diff)
downloadswift-contrib-e14208b0c3ced126400d6fd031a8d9a92da798c2.zip
swift-contrib-e14208b0c3ced126400d6fd031a8d9a92da798c2.tar.bz2
Fixed compiler warnings.
-rw-r--r--.gitignore1
-rw-r--r--Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7621959..a2d377d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,9 +39,10 @@ Swift/QtUI/DefaultTheme.qrc
checker-report.xml
VERSION.*
cppcheck.log
/build
/.settings/
/nbproject/private/
3rdParty/LibMiniUPnPc/src/miniupnpc/miniupnpcstrings.h
*.sublime-workspace
/xmppbench
+/.metadata
diff --git a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
index 25d35ff..023f11a 100644
--- a/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp
@@ -90,18 +90,19 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action
case JinglePayload::TransportReject:
return "transport-reject";
case JinglePayload::TransportReplace:
return "transport-replace";
case JinglePayload::UnknownAction:
std::cerr << "Serializing unknown action value." << std::endl;
return "";
}
assert(false);
+ return "";
}
std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::Type type) const {
switch(type) {
case JinglePayload::Reason::UnknownType:
std::cerr << "Unknown jingle reason type!" << std::endl;
return "";
case JinglePayload::Reason::AlternativeSession:
return "alternative-session";
@@ -133,12 +134,13 @@ std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::T
return "success";
case JinglePayload::Reason::Timeout:
return "timeout";
case JinglePayload::Reason::UnsupportedApplications:
return "unsupported-applications";
case JinglePayload::Reason::UnsupportedTransports:
return "unsupported-transports";
}
assert(false);
+ return "";
}
}