From 170e4555e21dd04aefe9585d3cd0b8a40b77d2f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Thu, 3 Oct 2024 08:15:48 +0300 Subject: [PATCH] MDEV-35040: Fix std::unique deleter for clang++-20 -stdlib=libc++ Thanks to Khem Raj for reporting this. --- extra/mariabackup/backup_copy.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index f4c1b5bc83a..120555c0f1a 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -60,6 +60,7 @@ Street, Fifth Floor, Boston, MA 02110-1335 USA #ifdef _WIN32 #include /* rmdir */ #endif +#include #define ROCKSDB_BACKUP_DIR "#rocksdb" @@ -1851,7 +1852,7 @@ is_aria_log_dir_file(const datadir_node_t &node) bool copy_back_aria_logs(const char *dstdir) { - std::unique_ptr + std::unique_ptr> ds_ctxt_aria_log_dir_path(ds_create(dstdir, DS_TYPE_LOCAL), ds_destroy); datadir_node_t node;