Skip to content

Commit 569ed45

Browse files
committed
Merge branch 'fix_msvc_warnings' into 'master'
Fix msvc warnings See merge request OpenMW/openmw!4579
2 parents 73bb170 + 51d73e3 commit 569ed45

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

apps/components_tests/misc/testmathutil.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ namespace Misc
5151
const std::pair<osg::Quat, osg::Vec3f> eulerAnglesXZQuat[] = {
5252
{
5353
osg::Quat(1, 0, 0, 0),
54-
osg::Vec3f(0, 0, osg::PI),
54+
osg::Vec3f(0, 0, osg::PIf),
5555
},
5656
{
5757
osg::Quat(0, 1, 0, 0),
5858
osg::Vec3f(0, 0, 0),
5959
},
6060
{
6161
osg::Quat(0, 0, 1, 0),
62-
osg::Vec3f(0, 0, osg::PI),
62+
osg::Vec3f(0, 0, osg::PIf),
6363
},
6464
{
6565
osg::Quat(0, 0, 0, 1),
@@ -128,15 +128,15 @@ namespace Misc
128128
const std::pair<osg::Quat, osg::Vec3f> eulerAnglesZYXQuat[] = {
129129
{
130130
osg::Quat(1, 0, 0, 0),
131-
osg::Vec3f(osg::PI, 0, 0),
131+
osg::Vec3f(osg::PIf, 0, 0),
132132
},
133133
{
134134
osg::Quat(0, 1, 0, 0),
135-
osg::Vec3f(osg::PI, 0, osg::PI),
135+
osg::Vec3f(osg::PIf, 0, osg::PIf),
136136
},
137137
{
138138
osg::Quat(0, 0, 1, 0),
139-
osg::Vec3f(0, 0, osg::PI),
139+
osg::Vec3f(0, 0, osg::PIf),
140140
},
141141
{
142142
osg::Quat(0, 0, 0, 1),

components/esm3/effectlist.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace ESM
3232
void EffectList::updateIndexes()
3333
{
3434
for (size_t i = 0; i < mList.size(); i++)
35-
mList[i].mIndex = i;
35+
mList[i].mIndex = static_cast<uint32_t>(i);
3636
}
3737

3838
void EffectList::add(ESMReader& esm)

components/lua/l10n.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ namespace
3232

3333
// Argument names
3434
const auto str = LuaUtil::cast<std::string>(key);
35-
argNames.push_back(icu::UnicodeString::fromUTF8(icu::StringPiece(str.data(), str.size())));
35+
argNames.push_back(
36+
icu::UnicodeString::fromUTF8(icu::StringPiece(str.data(), static_cast<int32_t>(str.size()))));
3637
}
3738
}
3839
}

0 commit comments

Comments
 (0)