Merge pull request #2753 from Tilka/fix_warnings

Fix some warnings
This commit is contained in:
flacs 2015-08-04 18:54:31 +02:00
commit 0aad44c980
4 changed files with 5 additions and 6 deletions

View File

@ -113,7 +113,7 @@ std::string StringFromFormat(const char* format, ...)
va_start(args, format); va_start(args, format);
std::string res = StringFromFormatV(format, args); std::string res = StringFromFormatV(format, args);
va_end(args); va_end(args);
return std::move(res); return res;
} }
std::string StringFromFormatV(const char* format, va_list args) std::string StringFromFormatV(const char* format, va_list args)
@ -139,7 +139,7 @@ std::string StringFromFormatV(const char* format, va_list args)
std::string temp = buf; std::string temp = buf;
free(buf); free(buf);
#endif #endif
return std::move(temp); return temp;
} }
// For Debugging. Read out an u8 array. // For Debugging. Read out an u8 array.

View File

@ -250,10 +250,9 @@ void Wiimote::Reset()
Wiimote::Wiimote( const unsigned int index ) Wiimote::Wiimote( const unsigned int index )
: m_index(index) : m_index(index)
, m_last_connect_request_counter(0)
, ir_sin(0) , ir_sin(0)
, ir_cos(1) , ir_cos(1)
// , m_sound_stream( nullptr ) , m_last_connect_request_counter(0)
{ {
// ---- set up all the controls ---- // ---- set up all the controls ----

View File

@ -1472,7 +1472,7 @@ void CFrame::ParseHotkeys()
VertexShaderManager::ResetView(); VertexShaderManager::ResetView();
// Savestates // Savestates
for (int i = 0; i < State::NUM_STATES; i++) for (unsigned int i = 0; i < State::NUM_STATES; i++)
{ {
if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i)) if (IsHotkey(HK_LOAD_STATE_SLOT_1 + i))
State::Load(1 + i); State::Load(1 + i);

View File

@ -28,7 +28,7 @@ static std::string GetName(const std::string& devnode)
std::string res = libevdev_get_name(dev); std::string res = libevdev_get_name(dev);
libevdev_free(dev); libevdev_free(dev);
close(fd); close(fd);
return std::move(res); return res;
} }
void Init(std::vector<Core::Device*> &controllerDevices) void Init(std::vector<Core::Device*> &controllerDevices)