ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Math: fix a warning on 32bit MSVC.

pull/388/merge
Vladimír Vondruš 6 years ago
parent
88ec50127e
commit
a2118730a3
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Magnum/Math/Color.cpp

6
src/Magnum/Math/Color.cpp
Unescape View File

@ -166,7 +166,7 @@ std::pair<TweakableState, Magnum::Math::Color3<Magnum::UnsignedByte>> TweakableP
return {TweakableState::Recompile, {}}; return {TweakableState::Recompile, {}};
} }
if(value.size() != (isSrgb ? 13 : 12)) { if(value.size() != std::size_t(isSrgb ? 13 : 12)) {
Error{} << "Utility::TweakableParser:" << std::string{value, value.size()} << "doesn't have expected number of digits"; Error{} << "Utility::TweakableParser:" << std::string{value, value.size()} << "doesn't have expected number of digits";
return {TweakableState::Error, {}}; return {TweakableState::Error, {}};
} }
@ -196,7 +196,7 @@ std::pair<TweakableState, Magnum::Math::Color4<Magnum::UnsignedByte>> TweakableP
return {TweakableState::Recompile, {}}; return {TweakableState::Recompile, {}};
} }
if(value.size() != (isSrgb ? 16 : 15)) { if(value.size() != std::size_t(isSrgb ? 16 : 15)) {
Error{} << "Utility::TweakableParser:" << std::string{value, value.size()} << "doesn't have expected number of digits"; Error{} << "Utility::TweakableParser:" << std::string{value, value.size()} << "doesn't have expected number of digits";
return {TweakableState::Error, {}}; return {TweakableState::Error, {}};
} }
@ -226,7 +226,7 @@ std::pair<TweakableState, Magnum::Math::Color3<Magnum::Float>> TweakableParser<M
return {TweakableState::Recompile, {}}; return {TweakableState::Recompile, {}};
} }
if(value.size() != (isSrgb ? 14 : 13)) { if(value.size() != std::size_t(isSrgb ? 14 : 13)) {
Error{} << "Utility::TweakableParser:" << std::string{value, value.size()} << "doesn't have expected number of digits"; Error{} << "Utility::TweakableParser:" << std::string{value, value.size()} << "doesn't have expected number of digits";
return {TweakableState::Error, {}}; return {TweakableState::Error, {}};
} }

Write Preview
Loading…
Cancel
Save