From e14208b0c3ced126400d6fd031a8d9a92da798c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 12 Feb 2012 13:41:02 +0100
Subject: Fixed compiler warnings.


diff --git a/.gitignore b/.gitignore
index 7621959..a2d377d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ cppcheck.log
 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
@@ -96,6 +96,7 @@ std::string JinglePayloadSerializer::actionToString(JinglePayload::Action action
 			return "";
 	}
 	assert(false);
+	return "";
 }
 
 std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::Type type) const {
@@ -139,6 +140,7 @@ std::string JinglePayloadSerializer::reasonTypeToString(JinglePayload::Reason::T
 			return "unsupported-transports";
 	}
 	assert(false);
+	return "";
 }
 
 }
-- 
cgit v0.10.2-6-g49f6