Fix more warnings:

- Externals/soundtouch/CMakeLists.txt: add -w (since it's not our code) to
silence an unused variable warning
- Source/Core/Core/NetPlayClient.cpp: Work around a Clang/libc++ bug where
initializing a std::array the way the standard says you're supposed to produces
a warning.  (libc++'s implementation of std::array, like any sane
implementation, has a C array as a field, so the most explicit form of
initialization would use two braces, one for the struct and one for the array.
Clang has a general warning for not being explicit with braces, which is
usually sane.  But the standard only guarantees that initializing std::array
works with a single pair of braces!)  There are other places in Dolphin that
incorrectly use double braces, presumably to avoid the warning, so maybe the
warning should just be turned off, but in any case here I just switch to an
equivalent .fill().
This commit is contained in:
comex 2016-07-10 21:51:28 -04:00
parent f2474e0404
commit 8a02473237
2 changed files with 2 additions and 1 deletions

View File

@ -16,3 +16,4 @@ set(SRCS
) )
add_library(SoundTouch STATIC ${SRCS}) add_library(SoundTouch STATIC ${SRCS})
add_definitions(-w)

View File

@ -722,7 +722,7 @@ bool NetPlayClient::StartGame(const std::string& path)
// Needed to prevent locking up at boot if (when) the wiimotes connect out of order. // Needed to prevent locking up at boot if (when) the wiimotes connect out of order.
NetWiimote nw; NetWiimote nw;
nw.resize(4, 0); nw.resize(4, 0);
m_wiimote_current_data_size = {4, 4, 4, 4}; m_wiimote_current_data_size.fill(4);
for (unsigned int w = 0; w < 4; ++w) for (unsigned int w = 0; w < 4; ++w)
{ {