summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <stephan.bergmann@allotropia.de>2024-09-11 20:22:25 +0200
committerStephan Bergmann <stephan.bergmann@allotropia.de>2024-09-12 08:03:43 +0200
commit294b4cc5458b9e20da98d12405a5942ae1551aee (patch)
tree23da09d91b431b3237f8bf12688d374b2f8dcb0e /vcl
parente94a35275670e0e3775c1bba305115d9941751f1 (diff)
These bogus -Wdangling-reference still hit with current GCC 15 trunk
Change-Id: Ice2be2156474cf486ad1c461d65e2711ebf43d2f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173232 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/layout.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d9ce06bc1ae0..988b470ca31f 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -964,12 +964,12 @@ static array_type assembleGrid(const VclGrid &rGrid)
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
#pragma GCC diagnostic pop
#endif
const vcl::Window *pChild = rEntry.pChild;
@@ -1101,7 +1101,7 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#elif defined _MSC_VER
@@ -1109,7 +1109,7 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
#pragma warning(disable : 4459)
#endif
const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
#pragma GCC diagnostic pop
#elif defined _MSC_VER
#pragma warning(pop)
@@ -1144,12 +1144,12 @@ static void calcMaxs(const array_type &A, std::vector<VclGrid::Value> &rWidths,
{
for (sal_Int32 y = 0; y < nMaxY; ++y)
{
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdangling-reference"
#endif
const GridEntry &rEntry = A[x][y];
-#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 14
+#if defined __GNUC__ && !defined __clang__ && __GNUC__ >= 13 && __GNUC__ <= 15
#pragma GCC diagnostic pop
#endif
const vcl::Window *pChild = rEntry.pChild;