mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-19 16:40:46 -09:00
fa40ef1d96
Fixes:
"missing #include <memory>" when building with GCC > 11.
Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
Signed-off-by: Romain Naour <romain.naour@smile.fr>
(cherry picked from commit 56ff67b50b)
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 81809dd5e6f611b1d64d952f6d96310bcc9c5fca Mon Sep 17 00:00:00 2001
|
|
From: Semphris <semphris@protonmail.com>
|
|
Date: Fri, 17 Jun 2022 12:36:26 -0400
|
|
Subject: [PATCH] Fix problem with GCC 11 and Partio's ZIP manager (missing
|
|
#include <memory>)
|
|
|
|
Closes #2219 on GitHub. Same fix, but puts the include closer to the copyright header.
|
|
|
|
Upstream: https://github.com/SuperTux/supertux/commit/81809dd5e6f611b1d64d952f6d96310bcc9c5fca
|
|
Signed-off-by: Michael Nosthoff <buildroot@heine.tech>
|
|
---
|
|
external/partio_zip/zip_manager.hpp | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/external/partio_zip/zip_manager.hpp b/external/partio_zip/zip_manager.hpp
|
|
index 666884dda53..245303c76be 100644
|
|
--- a/external/partio_zip/zip_manager.hpp
|
|
+++ b/external/partio_zip/zip_manager.hpp
|
|
@@ -1,8 +1,12 @@
|
|
// SOURCE: https://github.com/wdas/partio/blob/main/src/lib/io/ZIP.h
|
|
+// NOTE: This file was edited for purposes of compatibility with SuperTux.
|
|
|
|
-/*
|
|
+// This include has been added to fix a problem with GCC 11+ (and maybe 10)
|
|
+#include <memory>
|
|
+
|
|
+// =============================================================================
|
|
|
|
-NOTE: This file was edited for purposes of compatibility with SuperTux.
|
|
+/*
|
|
|
|
PARTIO SOFTWARE
|
|
Copyright 2010 Disney Enterprises, Inc. All rights reserved
|