2 files changed, 36 insertions, 1 deletions
diff --git a/Swiften/Base/BoostRandomGenerator.h b/Swiften/Base/BoostRandomGenerator.h
index b5a6cac..6065ff3 100644
--- a/Swiften/Base/BoostRandomGenerator.h
+++ b/Swiften/Base/BoostRandomGenerator.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <Swiften/Base/RandomGenerator.h>
+#include <Swiften/Base/Override.h>
 
 #include <boost/random/mersenne_twister.hpp>
 
@@ -15,7 +16,7 @@ namespace Swift {
 		public:
 			BoostRandomGenerator();
 
-			int generateRandomInteger(int max);
+			int generateRandomInteger(int max) SWIFTEN_OVERRIDE;
 
 		private:
 			boost::mt19937 generator;
diff --git a/Swiften/Base/Override.h b/Swiften/Base/Override.h
new file mode 100644
index 0000000..7f410cf
--- /dev/null
+++ b/Swiften/Base/Override.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2012 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#if defined(__clang__)
+# if __has_feature(cxx_override_control) || __has_extension(cxx_override_control)
+#  define SWIFTEN_OVERRIDE override
+# else
+#  define SWIFTEN_OVERRIDE
+# endif
+
+#elif defined(__GNUC__)
+# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7))
+#  define SWIFTEN_OVERRIDE override
+# else
+#  define SWIFTEN_OVERRIDE
+# endif
+
+#elif defined(_MSC_VER)
+// Actually, 1700 is the first version that supports the C++11 override, but
+// older versions apparently support a similar keyword.
+# if _MSC_VER >= 1400
+#  define SWIFTEN_OVERRIDE override
+# else
+#  define SWIFTEN_OVERRIDE
+# endif
+
+#else
+# define SWIFTEN_OVERRIDE
+#endif