summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
@@ -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 "";
}
}