1 files changed, 5 insertions, 5 deletions

diff --git a/src/common/swap.h b/src/common/swap.h
index 7665942a2..8c68c1f26 100644
--- a/src/common/swap.h
+++ b/src/common/swap.h
@@ -504,35 +504,35 @@ bool operator==(const S& p, const swap_struct_t<T, F> v) {
 template <typename T>
 struct swap_64_t {
     static T swap(T x) {
-        return static_cast<T>(Common::swap64(x));
+        return static_cast<T>(Common::swap64(static_cast<u64>(x)));
     }
 };
 
 template <typename T>
 struct swap_32_t {
     static T swap(T x) {
-        return static_cast<T>(Common::swap32(x));
+        return static_cast<T>(Common::swap32(static_cast<u32>(x)));
     }
 };
 
 template <typename T>
 struct swap_16_t {
     static T swap(T x) {
-        return static_cast<T>(Common::swap16(x));
+        return static_cast<T>(Common::swap16(static_cast<u16>(x)));
     }
 };
 
 template <typename T>
 struct swap_float_t {
     static T swap(T x) {
-        return static_cast<T>(Common::swapf(x));
+        return static_cast<T>(Common::swapf(static_cast<float>(x)));
     }
 };
 
 template <typename T>
 struct swap_double_t {
     static T swap(T x) {
-        return static_cast<T>(Common::swapd(x));
+        return static_cast<T>(Common::swapd(static_cast<double>(x)));
     }
 };