Cleanup: add C++ compatible WL_ARRAY_FOR_EACH macro

This commit is contained in:
Campbell Barton 2022-06-24 10:21:45 +10:00
parent cc09661c4e
commit 70648683a2
3 changed files with 23 additions and 6 deletions

View File

@ -265,6 +265,7 @@ ForEachMacros:
- SET_SLOT_PROBING_BEGIN
- MAP_SLOT_PROBING_BEGIN
- VECTOR_SET_SLOT_PROBING_BEGIN
- WL_ARRAY_FOR_EACH
StatementMacros:
- PyObject_HEAD

View File

@ -0,0 +1,19 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/** \file
* \ingroup GHOST
*/
#pragma once
#ifdef __cplusplus
# undef wl_array_for_each
/**
* This macro causes a warning for C++ code, define our own.
* See: https://gitlab.freedesktop.org/wayland/wayland/-/issues/34
*/
# define WL_ARRAY_FOR_EACH(pos, array) \
for (pos = (decltype(pos))((array)->data); \
(const char *)pos < ((const char *)(array)->data + (array)->size); \
(pos)++)
#endif

View File

@ -6,6 +6,7 @@
#include "GHOST_WindowWayland.h"
#include "GHOST_SystemWayland.h"
#include "GHOST_WaylandUtils.h"
#include "GHOST_WindowManager.h"
#include "GHOST_Event.h"
@ -134,12 +135,8 @@ static void xdg_toplevel_handle_configure(void *data,
win->is_fullscreen = false;
win->is_active = false;
/* Note that the macro 'wl_array_for_each' would typically be used to simplify this logic,
* however it's not compatible with C++, so perform casts instead.
* If this needs to be done more often we could define our own C++ compatible macro. */
for (enum xdg_toplevel_state *state = static_cast<xdg_toplevel_state *>(states->data);
reinterpret_cast<uint8_t *>(state) < (static_cast<uint8_t *>(states->data) + states->size);
state++) {
enum xdg_toplevel_state *state;
WL_ARRAY_FOR_EACH (state, states) {
switch (*state) {
case XDG_TOPLEVEL_STATE_MAXIMIZED:
win->is_maximised = true;