BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings in bit functions

Browse Source
This commit is contained in:
Matvey Cherevko
2019-11-16 09:59:04 +07:00
parent ac1bf0e6cb
commit 9f1737c2b5
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
headers/enduro2d/math/_math.hpp
View File

@@ -303,7 +303,7 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
T> T>
set_flags(T flags, U flag_mask) noexcept { set_flags(T flags, U flag_mask) noexcept {
return flags | flag_mask; return flags | static_cast<T>(flag_mask);
} }
template < typename T, typename U > template < typename T, typename U >
@@ -321,7 +321,7 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
T> T>
flip_flags(T flags, U flag_mask) noexcept { flip_flags(T flags, U flag_mask) noexcept {
return flags ^ flag_mask; return flags ^ static_cast<T>(flag_mask);
} }
template < typename T, typename U > template < typename T, typename U >
@@ -339,7 +339,7 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
T> T>
clear_flags(T flags, U flag_mask) noexcept { clear_flags(T flags, U flag_mask) noexcept {
return flags & ~flag_mask; return flags & ~static_cast<T>(flag_mask);
} }
template < typename T, typename U > template < typename T, typename U >
@@ -357,7 +357,7 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
bool> bool>
check_any_flags(T flags, U flag_mask) noexcept { check_any_flags(T flags, U flag_mask) noexcept {
return !!(flags & flag_mask); return !!(flags & static_cast<T>(flag_mask));
} }
template < typename T, typename U > template < typename T, typename U >
@@ -366,7 +366,7 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
bool> bool>
check_all_flags(T flags, U flag_mask) noexcept { check_all_flags(T flags, U flag_mask) noexcept {
return flag_mask == (flags & flag_mask); return static_cast<T>(flag_mask) == (flags & static_cast<T>(flag_mask));
} }
template < typename T, typename U > template < typename T, typename U >
@@ -375,10 +375,10 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
bool> bool>
check_and_set_any_flags(T& flags, U flag_mask) noexcept { check_and_set_any_flags(T& flags, U flag_mask) noexcept {
if ( flag_mask == (flags & flag_mask) ) { if ( static_cast<T>(flag_mask) == (flags & static_cast<T>(flag_mask)) ) {
return false; return false;
} }
flags |= flag_mask; flags |= static_cast<T>(flag_mask);
return true; return true;
} }
@@ -388,10 +388,10 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
bool> bool>
check_and_set_all_flags(T& flags, U flag_mask) noexcept { check_and_set_all_flags(T& flags, U flag_mask) noexcept {
if ( !!(flags & flag_mask) ) { if ( !!(flags & static_cast<T>(flag_mask)) ) {
return false; return false;
} }
flags |= flag_mask; flags |= static_cast<T>(flag_mask);
return true; return true;
} }
@@ -401,10 +401,10 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
bool> bool>
check_and_clear_any_flags(T& flags, U flag_mask) noexcept { check_and_clear_any_flags(T& flags, U flag_mask) noexcept {
if ( !(flags & flag_mask) ) { if ( !(flags & static_cast<T>(flag_mask)) ) {
return false; return false;
} }
flags &= ~flag_mask; flags &= ~static_cast<T>(flag_mask);
return true; return true;
} }
@@ -414,10 +414,10 @@ namespace e2d::math
std::is_convertible_v<U,T>, std::is_convertible_v<U,T>,
bool> bool>
check_and_clear_all_flags(T& flags, U flag_mask) noexcept { check_and_clear_all_flags(T& flags, U flag_mask) noexcept {
if ( flag_mask != (flags & flag_mask) ) { if ( static_cast<T>(flag_mask) != (flags & static_cast<T>(flag_mask)) ) {
return false; return false;
} }
flags &= ~flag_mask; flags &= ~static_cast<T>(flag_mask);
return true; return true;
} }