From 75080681626062e5832aec0b1bb3aa37d8364822 Mon Sep 17 00:00:00 2001 From: Alex Nemirovsky Date: Sat, 1 Feb 2025 03:05:15 -0800 Subject: [PATCH] Macports, fix compile error using newer compiler found in OSX Sequioa see issue here: https://trac.macports.org/ticket/65361 --- encfs/NullCipher.cpp | 2 +- encfs/main.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/encfs/NullCipher.cpp b/encfs/NullCipher.cpp index 50dadffd..5e1a4729 100644 --- a/encfs/NullCipher.cpp +++ b/encfs/NullCipher.cpp @@ -76,7 +76,7 @@ class NullDestructor { NullDestructor &operator=(const NullDestructor &) = delete; // copy assignment NullDestructor& operator=(NullDestructor&& other) = delete; // move assignment - void operator()(NullKey *&) {} + void operator()(NullKey *) {} }; std::shared_ptr gNullKey(new NullKey(), NullDestructor()); diff --git a/encfs/main.cpp b/encfs/main.cpp index 71dfd71d..26b4a682 100644 --- a/encfs/main.cpp +++ b/encfs/main.cpp @@ -28,6 +28,10 @@ #include #include #include +#ifdef __APPLE__ +#include +#include +#endif #ifdef __CYGWIN__ #include #endif