3 files changed, 7 insertions, 6 deletions
diff --git a/Swiften/Base/ByteArray.cpp b/Swiften/Base/ByteArray.cpp
index 6be96aa..d6b5c97 100644
--- a/Swiften/Base/ByteArray.cpp
+++ b/Swiften/Base/ByteArray.cpp
@@ -1,11 +1,12 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include <Swiften/Base/ByteArray.h>
 
+#include <boost/numeric/conversion/cast.hpp>
 #include <fstream>
 
 namespace Swift {
@@ -18,7 +19,7 @@ void readByteArrayFromFile(ByteArray& data, const std::string& file) {
 		size_t oldSize = data.size();
 		data.resize(oldSize + BUFFER_SIZE);
 		input.read(reinterpret_cast<char*>(&data[oldSize]), BUFFER_SIZE);
-		data.resize(oldSize + input.gcount());
+		data.resize(oldSize + boost::numeric_cast<size_t>(input.gcount()));
 	}
 	input.close();
 }
diff --git a/Swiften/Base/ByteArray.h b/Swiften/Base/ByteArray.h
index 34b89d3..8688aab 100644
--- a/Swiften/Base/ByteArray.h
+++ b/Swiften/Base/ByteArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -26,7 +26,7 @@ namespace Swift {
 	}
 
 	inline ByteArray createByteArray(char c) {
-		return std::vector<unsigned char>(1, c);
+		return std::vector<unsigned char>(1, static_cast<unsigned char>(c));
 	}
 
 	template<typename T, typename A>
diff --git a/Swiften/Base/SafeByteArray.h b/Swiften/Base/SafeByteArray.h
index dda51fe..b85373c 100644
--- a/Swiften/Base/SafeByteArray.h
+++ b/Swiften/Base/SafeByteArray.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Remko Tronçon
+ * Copyright (c) 2011-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -31,7 +31,7 @@ namespace Swift {
 	}
 
 	inline SafeByteArray createSafeByteArray(char c) {
-		return SafeByteArray(1, c);
+		return SafeByteArray(1, static_cast<unsigned char>(c));
 	}
 
 	inline SafeByteArray createSafeByteArray(const char* c, size_t n) {