From ee6250380fa856cf9dbe8b5e79737df363600a15 Mon Sep 17 00:00:00 2001 From: Bernhard Rosenkraenzer Date: Fri, 22 Jul 2022 14:13:38 +0200 Subject: [PATCH] Fix build with fmt 9.0 (#433) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix build with fmt 9.0 Co-authored-by: Sebastian Meßmer --- ChangeLog.txt | 4 ++++ src/fspp/fuse/Fuse.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 77c25c10..ac7af665 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,7 @@ +Version 0.11.3 +--------------- +* Fixed build issue on systems with libfmt 9.0 (see https://github.com/cryfs/cryfs/issues/432 ) + Version 0.11.2 --------------- Bugfix: diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp index 4e9dbd7f..4b881815 100644 --- a/src/fspp/fuse/Fuse.cpp +++ b/src/fspp/fuse/Fuse.cpp @@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) { UNUSED(mode); UNUSED(path); ThreadNameForDebugging _threadName("mknod"); - LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode); + LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode); return ENOSYS; } int Fuse::mkdir(const bf::path &path, ::mode_t mode) { ThreadNameForDebugging _threadName("mkdir"); #ifdef FSPP_LOG - LOG(DEBUG, "mkdir({}, {})", path, mode); + LOG(DEBUG, "mkdir({}, {})", path.string(), mode); #endif try { ASSERT(is_valid_fspp_path(path), "has to be an absolute path"); // DokanY seems to call mkdir("/"). Ignore that if ("/" == path) { #ifdef FSPP_LOG - LOG(DEBUG, "mkdir({}, {}): ignored", path, mode); + LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode); #endif return 0; } @@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) { //TODO int Fuse::link(const bf::path &from, const bf::path &to) { ThreadNameForDebugging _threadName("link"); - LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to); + LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string()); //auto real_from = _impl->RootDir() / from; //auto real_to = _impl->RootDir() / to; //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());