Silence warnings on decltype() with Wine 5.22

There were already similar warnings on 32-bit winegcc, but now it also
happens on the 64-bit version. Instead of adding
`-Wno-ignored-attributes` we'll just sprinkle some warning ignores here
and there to prevent any other surprises.
This commit is contained in:
Robbert van der Helm
2020-11-29 13:18:15 +01:00
parent cbf276b7dc
commit e08162fabf
5 changed files with 24 additions and 9 deletions
+4
View File
@@ -170,6 +170,9 @@ Editor::Editor(const Configuration& config,
ShowWindow(win32_handle.get(), SW_SHOWNORMAL);
if (config.editor_double_embed) {
// FIXME: This emits `-Wignored-attributes` as of Wine 5.22
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wignored-attributes"
// As explained above, we can't do this directly in the initializer list
win32_child_handle = std::unique_ptr<std::remove_pointer_t<HWND>,
decltype(&DestroyWindow)>(
@@ -179,6 +182,7 @@ Editor::Editor(const Configuration& config,
client_area.width, client_area.height, win32_handle.get(),
nullptr, GetModuleHandle(nullptr), this),
DestroyWindow);
#pragma GCC diagnostic pop
ShowWindow(win32_child_handle->get(), SW_SHOWNORMAL);
}