From ab85d6a69378adcedd75439bf17c4e437857cd34 Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 19 Jun 2025 16:29:52 +0200 Subject: [PATCH] shut the up -Waggregate-return --- src/r_plane.cpp | 6 ++++++ src/r_things.cpp | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/r_plane.cpp b/src/r_plane.cpp index 9610c0c84..81e02c370 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -737,9 +737,12 @@ void R_DrawPlanes(void) } } #ifdef HAVE_THREADS +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Waggregate-return" tp_sema = srb2::g_main_threadpool->end_sema(); srb2::g_main_threadpool->notify_sema(tp_sema); srb2::g_main_threadpool->wait_sema(tp_sema); +#pragma GCC diagnostic pop #endif } @@ -765,9 +768,12 @@ void R_DrawSkyPlanes(void) } } #ifdef HAVE_THREADS +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Waggregate-return" tp_sema = srb2::g_main_threadpool->end_sema(); srb2::g_main_threadpool->notify_sema(tp_sema); srb2::g_main_threadpool->wait_sema(tp_sema); +#pragma GCC diagnostic pop #endif } diff --git a/src/r_things.cpp b/src/r_things.cpp index 522caf546..9aaa47c9f 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -2978,9 +2978,12 @@ static void R_DrawMaskedList(drawnode_t* head) #endif R_DrawSinglePlane(&ds, r2->plane, cv_parallelsoftware.value); #ifdef HAVE_THREADS +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Waggregate-return" tp_sema = srb2::g_main_threadpool->end_sema(); srb2::g_main_threadpool->notify_sema(tp_sema); srb2::g_main_threadpool->wait_sema(tp_sema); +#pragma GCC diagnostic pop #endif R_DoneWithNode(r2); r2 = next;