From a9f9e81330792188ef984cb5905f7fe1df9ed093 Mon Sep 17 00:00:00 2001 From: comex Date: Sat, 25 Oct 2014 15:39:24 -0400 Subject: [PATCH] Use double braces for std:array initialization to avoid clang warning. std::array does not have an initializer list constructor, instead (for some reason) being defined to contain one public array member, allowing it to be directly initialized. Thus the most explicit way to initialize it is with two braces, one for the struct and one for the array. C++ allows the second pair of braces to be omitted, but clang complains about it. --- Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp index c61aa71883..7bfd921640 100644 --- a/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp +++ b/Source/Core/DolphinWX/Cheats/CheatSearchTab.cpp @@ -42,7 +42,7 @@ CheatSearchTab::CheatSearchTab(wxWindow* const parent) m_btn_next_scan->Disable(); // data sizes radiobox - std::array data_size_names = { _("8-bit"), _("16-bit"), _("32-bit") }; + std::array data_size_names = {{ _("8-bit"), _("16-bit"), _("32-bit") }}; m_data_sizes = new wxRadioBox(this, wxID_ANY, _("Data Size"), wxDefaultPosition, wxDefaultSize, static_cast(data_size_names.size()), data_size_names.data()); // result controls