Merge 541f5d6e2d03aa3b41df9464fa012d1bdf993f60 into d9b051210ba756d28086c9b75e983e84ae11e730

Use helper deleter for invoking fclose.
This fixes warnings from GCC-14 about ignored attributes when using std::unique_ptr<FILE>
2025-02-03 05:45:01 +01:00 · 2024-10-23 11:15:35 +02:00 · 2024-10-23 11:15:10 +02:00
1 changed files with 8 additions and 2 deletions
--- a/src/opustags.h
+++ b/src/opustags.h
@ -119,13 +119,19 @@ using byte_string_view = std::basic_string_view<uint8_t>;
 * \{
 */

+/** Local helper deleter function. */
+static void fclose_deleter(FILE* f)
+{
+	fclose(f);
+}
+
 /**
 * Smart auto-closing FILE* handle.
 *
 * It implictly converts from an already opened FILE*.
 */
-struct file : std::unique_ptr<FILE, decltype(&fclose)> {
-	file(FILE* f = nullptr) : std::unique_ptr<FILE, decltype(&fclose)>(f, &fclose) {}
+struct file : std::unique_ptr<FILE, decltype(&fclose_deleter)> {
+	file(FILE* f = nullptr) : std::unique_ptr<FILE, decltype(&fclose_deleter)>(f, &fclose_deleter) {}
 };

 /**
Author	SHA1	Message	Date
Eddy L O Jansson	ed39938567	Merge 541f5d6e2d03aa3b41df9464fa012d1bdf993f60 into d9b051210ba756d28086c9b75e983e84ae11e730	2024-10-23 11:15:35 +02:00
Eddy Jansson	541f5d6e2d	Use helper deleter for invoking fclose. This fixes warnings from GCC-14 about ignored attributes when using std::unique_ptr<FILE>	2024-10-23 11:15:10 +02:00