mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-01 03:21:41 +00:00
Code Issues Projects Releases Wiki Activity

Even more warning fixes

Browse Source
This commit is contained in:
AnyOldName3 2024-03-23 00:33:50 +00:00
parent 818a99a870
commit 1aff88e6a3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwdialogue/keywordsearch.hpp
View File

@ -87,7 +87,7 @@ namespace MWDialogue
// some keywords might be longer variations of other keywords, so we definitely need a list of
// candidates the first element in the pair is length of the match, i.e. depth from the first character
// on
std::vector<typename std::pair<int, typename Entry::childen_t::const_iterator>> candidates;
std::vector<typename std::pair<std::ptrdiff_t, typename Entry::childen_t::const_iterator>> candidates;
while ((j + 1) != end)
{

2
apps/openmw_test_suite/openmw/options.cpp
View File

@ -36,7 +36,7 @@ namespace
(result.emplace_back(makeString(args)), ...);
for (int i = 1; i <= std::numeric_limits<char>::max(); ++i)
if (i != '&' && i != '"' && i != ' ' && i != '\n')
result.push_back(std::string(1, i));
result.push_back(std::string(1, static_cast<char>(i)));
return result;
}

4
apps/openmw_test_suite/sqlite3/request.cpp
View File

@ -151,7 +151,7 @@ namespace
const std::int64_t value = 1099511627776;
EXPECT_EQ(execute(*mDb, insert, value), 1);
Statement select(*mDb, GetAll("ints"));
std::vector<std::tuple<int>> result;
std::vector<std::tuple<std::int64_t>> result;
request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max());
EXPECT_THAT(result, ElementsAre(std::tuple(value)));
}
@ -205,7 +205,7 @@ namespace
const std::int64_t value = 1099511627776;
EXPECT_EQ(execute(*mDb, insert, value), 1);
Statement select(*mDb, GetExact<std::int64_t>("ints"));
std::vector<std::tuple<int>> result;
std::vector<std::tuple<std::int64_t>> result;
request(*mDb, select, std::back_inserter(result), std::numeric_limits<std::size_t>::max(), value);
EXPECT_THAT(result, ElementsAre(std::tuple(value)));
}

4
apps/openmw_test_suite/toutf8/toutf8.cpp
View File

@ -47,7 +47,7 @@ namespace
{
std::string input;
for (int c = 1; c <= std::numeric_limits<char>::max(); ++c)
input.push_back(c);
input.push_back(static_cast<char>(c));
Utf8Encoder encoder(FromType::CP437);
const std::string_view result = encoder.getUtf8(input);
EXPECT_EQ(result.data(), input.data());
@ -99,7 +99,7 @@ namespace
{
std::string input;
for (int c = 1; c <= std::numeric_limits<char>::max(); ++c)
input.push_back(c);
input.push_back(static_cast<char>(c));
Utf8Encoder encoder(FromType::CP437);
const std::string_view result = encoder.getLegacyEnc(input);
EXPECT_EQ(result.data(), input.data());