Date: Sat, 14 May 2022 17:45:18 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21b89b758b1c - main - www/libecap: Fix build with Clang 13+ Message-ID: <202205141745.24EHjIV0002923@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=21b89b758b1c5c57b4ccbb02301da48ba5099753 commit 21b89b758b1c5c57b4ccbb02301da48ba5099753 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2022-05-14 17:45:13 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2022-05-14 17:45:13 +0000 www/libecap: Fix build with Clang 13+ --- www/libecap/files/patch-src-libecap-common-memory.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/libecap/files/patch-src-libecap-common-memory.h b/www/libecap/files/patch-src-libecap-common-memory.h index db4f9894ee89..74c88a184087 100644 --- a/www/libecap/files/patch-src-libecap-common-memory.h +++ b/www/libecap/files/patch-src-libecap-common-memory.h @@ -1,11 +1,13 @@ --- src/libecap/common/memory.h.orig 2014-10-02 04:05:24 UTC +++ src/libecap/common/memory.h -@@ -4,14 +4,23 @@ +@@ -4,14 +4,28 @@ #define LIBECAP__COMMON_MEMORY_H #include <libecap/common/libecap.h> +#if defined(_LIBCPP_VERSION) +#include <memory> ++#elif defined(__clang_major__) && __clang_major__ >= 13 ++#include <memory> +#else #include <tr1/memory> +#endif @@ -17,6 +19,9 @@ +#if defined(_LIBCPP_VERSION) +using std::weak_ptr; +using std::shared_ptr; ++#elif defined(__clang_major__) && __clang_major__ >= 13 ++using std::weak_ptr; ++using std::shared_ptr; +#else using std::tr1::weak_ptr; using std::tr1::shared_ptr;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205141745.24EHjIV0002923>