Skip to content
This repository has been archived by the owner on May 13, 2024. It is now read-only.

Fix 10 MSVC narrowing cast warnings from irrString and irrArray #261

Merged
merged 2 commits into from
Dec 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions include/irrArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class array
/** \return Size of elements in the array which are actually occupied. */
u32 size() const
{
return m_data.size();
return static_cast<u32>(m_data.size());
}


Expand Down Expand Up @@ -317,7 +317,7 @@ class array
// *it = first element in [first, last) that is >= element, or last if not found.
if (*it < element || element < *it)
return -1;
return it - m_data.begin();
return static_cast<u32>(it - m_data.begin());
}


Expand All @@ -335,8 +335,8 @@ class array
auto iters = std::equal_range(m_data.begin(), m_data.end(), element);
if (iters.first == iters.second)
return -1;
last = (iters.second - m_data.begin()) - 1;
return iters.first - m_data.begin();
last = static_cast<s32>((iters.second - m_data.begin()) - 1);
return static_cast<s32>(iters.first - m_data.begin());
}


Expand All @@ -351,7 +351,7 @@ class array
auto it = std::find(m_data.begin(), m_data.end(), element);
if (it == m_data.end())
return -1;
return it - m_data.begin();
return static_cast<u32>(it - m_data.begin());
}


Expand Down
10 changes: 5 additions & 5 deletions include/irrString.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class string
the trailing NUL. */
u32 size() const
{
return str.size();
return static_cast<u32>(str.size());
}

//! Informs if the string is empty or not.
Expand Down Expand Up @@ -834,7 +834,7 @@ class string
if (!delimiter)
return 0;

const u32 oldSize=ret.size();
const u32 oldSize=static_cast<u32>(ret.size());

u32 tokenStartIdx = 0;
for (u32 i=0; i<size()+1; ++i)
Expand Down Expand Up @@ -862,7 +862,7 @@ class string
else if (!ignoreEmptyTokens)
ret.push_back(string<T>());

return ret.size()-oldSize;
return static_cast<u32>(ret.size()-oldSize);
}

// This function should not be used and is only kept for "CGUIFileOpenDialog::pathToStringW".
Expand All @@ -888,10 +888,10 @@ class string
return len;
}
static inline u32 calclen(const char* p) {
return strlen(p);
return static_cast<u32>(strlen(p));
}
static inline u32 calclen(const wchar_t* p) {
return wcslen(p);
return static_cast<u32>(wcslen(p));
}

//! strcmp wrapper
Expand Down