From f9161963b7b00a3e1ea862760983fdf138b63680 Mon Sep 17 00:00:00 2001 From: Alug Date: Tue, 1 Jul 2025 14:38:32 +0200 Subject: [PATCH] "-Wno-aggregate-return" for c++ --- src/Makefile.d/versions.mk | 3 +++ src/r_plane.cpp | 6 ------ src/r_things.cpp | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/Makefile.d/versions.mk b/src/Makefile.d/versions.mk index 7c130d908..74fabb4a4 100644 --- a/src/Makefile.d/versions.mk +++ b/src/Makefile.d/versions.mk @@ -16,6 +16,9 @@ $(foreach v,$(join $(wordlist 2,$(_n),- $(gcc_versions)),\ $(and $(findstring =,$(v)),\ $(eval $(call _predecessor,$(subst =, ,$(v)))))) +# aggregate returns seem to happen alot in c++ so just supress em lel +CXXFLAGS+= -Wno-aggregate-return + # -W -Wno-unused WFLAGS:=-Wall -Wno-trigraphs ifndef GCC295 diff --git a/src/r_plane.cpp b/src/r_plane.cpp index c52771bc4..4d6244468 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -740,12 +740,9 @@ 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 } @@ -771,12 +768,9 @@ 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 021b5f500..0ec9da3a6 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -2985,12 +2985,9 @@ 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;