Fix some clang warnings

-Wunqualified-std-cast-call and -Wsign-compare.
This commit is contained in:
Arthur Eubanks
2024-04-16 23:40:54 -07:00
committed by teejusb
parent 481161574e
commit bdafbd4660
4 changed files with 10 additions and 10 deletions
+1 -1
View File
@@ -32,7 +32,7 @@ const RString &CourseDifficultyToLocalizedString( CourseDifficulty x )
FOREACH_ENUM( Difficulty,i)
{
std::unique_ptr<LocalizedString> ap( new LocalizedString("CourseDifficulty", DifficultyToString(i)) );
g_CourseDifficultyName[i] = move(ap);
g_CourseDifficultyName[i] = std::move(ap);
}
}
return g_CourseDifficultyName[x]->GetValue();
+2 -2
View File
@@ -87,11 +87,11 @@ const RString &EnumToString( int iVal, int iMax, const char **szNameArray, std::
for( int i = 0; i < iMax; ++i )
{
std::unique_ptr<RString> ap( new RString( szNameArray[i] ) );
pNameCache[i] = move(ap);
pNameCache[i] = std::move(ap);
}
std::unique_ptr<RString> ap( new RString );
pNameCache[iMax+1] = move(ap);
pNameCache[iMax+1] = std::move(ap);
}
// iMax+1 is "Invalid". iMax+0 is the NUM_ size value, which can not be converted
+1 -1
View File
@@ -97,7 +97,7 @@ const RString &X##ToLocalizedString( X x ) \
for( unsigned i = 0; i < NUM_##X; ++i ) \
{ \
std::unique_ptr<LocalizedString> ap( new LocalizedString(#X, X##ToString((X)i)) ); \
g_##X##Name[i] = move(ap); \
g_##X##Name[i] = std::move(ap); \
} \
} \
return g_##X##Name[x]->GetValue(); \
@@ -114,7 +114,7 @@ void InputHandler_Linux_Joystick::InputThread()
FD_ZERO(&fdset);
int max_fd = -1;
for(int i = 0; i < m_files.size(); ++i)
for(size_t i = 0; i < m_files.size(); ++i)
{
if (m_files[i].fd < 0)
continue;
@@ -131,7 +131,7 @@ void InputHandler_Linux_Joystick::InputThread()
continue;
RageTimer now;
for(int i = 0; i < m_files.size(); ++i)
for(size_t i = 0; i < m_files.size(); ++i)
{
if( m_files[i].fd == -1 )
continue;
@@ -144,7 +144,7 @@ void InputHandler_Linux_Joystick::InputThread()
if(ret == -1)
{
LOG->Warn("Error reading from joystick %i: %s; disabled", i, strerror(errno));
LOG->Warn("Error reading from joystick %zu: %s; disabled", i, strerror(errno));
close(m_files[i].fd);
m_files[i].fd = -1;
continue;
@@ -152,7 +152,7 @@ void InputHandler_Linux_Joystick::InputThread()
if(ret != sizeof(event))
{
LOG->Warn("Unexpected packet (size %i != %i) from joystick %i; disabled", ret, (int)sizeof(event), i);
LOG->Warn("Unexpected packet (size %i != %i) from joystick %zu; disabled", ret, (int)sizeof(event), i);
close(m_files[i].fd);
m_files[i].fd = -1;
continue;
@@ -181,7 +181,7 @@ void InputHandler_Linux_Joystick::InputThread()
}
default:
LOG->Warn("Unexpected packet (type %i) from joystick %i; disabled", event.type, i);
LOG->Warn("Unexpected packet (type %i) from joystick %zu; disabled", event.type, i);
close(m_files[i].fd);
m_files[i].fd = -1;
continue;
@@ -201,7 +201,7 @@ void InputHandler_Linux_Joystick::GetDevicesAndDescriptions( std::vector<InputDe
// and is (hopefully) in the same thread as TryDevice... so doublecheck our thread now.
if( m_files.empty() && !m_InputThread.IsCreated() ) StartThread();
for(int i = 0; i < m_files.size(); ++i)
for(size_t i = 0; i < m_files.size(); ++i)
{
if (m_files[i].fd < 0)
continue;