Skip to content

Commit 21f3de1

Browse files
authored
Merge pull request #18650 from victoryforce/fix-nightly-build
Avoid nightly build failure by ignoring `-Wshadow` for exiv2 includes
2 parents 59279c6 + bd1fc8d commit 21f3de1

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

tools/basecurve/exif-wrapper.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
This file is part of darktable,
33
2014 Edouard Gomez
4+
Copyright (C) 2025 darktable developers.
45
56
darktable is free software: you can redistribute it and/or modify
67
it under the terms of the GNU General Public License as published by
@@ -16,9 +17,13 @@
1617
along with darktable. If not, see <http://www.gnu.org/licenses/>.
1718
*/
1819

20+
// avoid error reported when including exiv2.hpp on macOS (XCode 15.2)
21+
#pragma GCC diagnostic push
22+
#pragma GCC diagnostic ignored "-Wshadow"
1923
#include <exiv2/exif.hpp>
2024
#include <exiv2/error.hpp>
2125
#include <exiv2/image.hpp>
26+
#pragma GCC diagnostic pop
2227

2328
#include <cstdio>
2429
#include <cassert>

0 commit comments

Comments
 (0)