summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Kortunov <andrei.kortunov@yandex.ru>2021-10-24 18:45:46 +0400
committerAndrei Kortunov <andrei.kortunov@yandex.ru>2021-10-24 18:45:46 +0400
commit0f3c0cb0a0dc637b329cab199932022071c01492 (patch)
treef0d7cf297c0d53dbec2dcdf4b23edf4116e91acf
parent107a9ecb1701c753804fd9fed04aafa3980f1aaa (diff)
Fix argument types mismatchwarnfix
-rw-r--r--components/detournavigator/preparednavmeshdatatuple.hpp16
-rw-r--r--components/esm/luascripts.cpp2
2 files changed, 9 insertions, 9 deletions
diff --git a/components/detournavigator/preparednavmeshdatatuple.hpp b/components/detournavigator/preparednavmeshdatatuple.hpp
index 8ff1267370..bcca0ace37 100644
--- a/components/detournavigator/preparednavmeshdatatuple.hpp
+++ b/components/detournavigator/preparednavmeshdatatuple.hpp
@@ -14,11 +14,11 @@ namespace DetourNavigator
constexpr auto makeTuple(const rcPolyMesh& v) noexcept
{
return std::tuple(
- Span(v.verts, getVertsLength(v)),
- Span(v.polys, getPolysLength(v)),
- Span(v.regs, getRegsLength(v)),
- Span(v.flags, getFlagsLength(v)),
- Span(v.areas, getAreasLength(v)),
+ Span(v.verts, static_cast<int>(getVertsLength(v))),
+ Span(v.polys, static_cast<int>(getPolysLength(v))),
+ Span(v.regs, static_cast<int>(getRegsLength(v))),
+ Span(v.flags, static_cast<int>(getFlagsLength(v))),
+ Span(v.areas, static_cast<int>(getAreasLength(v))),
ArrayRef(v.bmin),
ArrayRef(v.bmax),
v.cs,
@@ -31,9 +31,9 @@ namespace DetourNavigator
constexpr auto makeTuple(const rcPolyMeshDetail& v) noexcept
{
return std::tuple(
- Span(v.meshes, getMeshesLength(v)),
- Span(v.verts, getVertsLength(v)),
- Span(v.tris, getTrisLength(v))
+ Span(v.meshes, static_cast<int>(getMeshesLength(v))),
+ Span(v.verts, static_cast<int>(getVertsLength(v))),
+ Span(v.tris, static_cast<int>(getTrisLength(v)))
);
}
diff --git a/components/esm/luascripts.cpp b/components/esm/luascripts.cpp
index 1dd45ab2b1..7ff841312a 100644
--- a/components/esm/luascripts.cpp
+++ b/components/esm/luascripts.cpp
@@ -32,7 +32,7 @@ std::string ESM::loadLuaBinaryData(ESMReader& esm)
{
esm.getSubHeader();
data.resize(esm.getSubSize());
- esm.getExact(data.data(), data.size());
+ esm.getExact(data.data(), static_cast<int>(data.size()));
}
return data;
}