From: squidadm Date: Tue, 21 May 2024 20:46:47 +0000 (+1200) Subject: Fix build with clang v18 [-Wvla-cxx-extension] (#1813) (#1817) X-Git-Tag: SQUID_6_10~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb0d1814dd1455f7f202f6018e895aa821763b01;p=thirdparty%2Fsquid.git Fix build with clang v18 [-Wvla-cxx-extension] (#1813) (#1817) src/fs/rock/RockRebuild.cc:356:17: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] char hdrBuf[SwapDir::HeaderSize]; note: initializer of 'HeaderSize' is unknown Co-authored-by: Francesco Chemolli <5175948+kinkie@users.noreply.github.com> --- diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index 111a89e649..37e8299bbd 100644 --- a/src/fs/rock/RockSwapDir.cc +++ b/src/fs/rock/RockSwapDir.cc @@ -37,8 +37,6 @@ #include #endif -const int64_t Rock::SwapDir::HeaderSize = 16*1024; - Rock::SwapDir::SwapDir(): ::SwapDir("rock"), slotSize(HeaderSize), filePath(nullptr), map(nullptr), io(nullptr), waitingForPage(nullptr) diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h index 53079a833f..ef6d9b6e73 100644 --- a/src/fs/rock/RockSwapDir.h +++ b/src/fs/rock/RockSwapDir.h @@ -148,7 +148,7 @@ private: /* configurable options */ DiskFile::Config fileConfig; ///< file-level configuration options - static const int64_t HeaderSize; ///< on-disk db header size + static const int64_t HeaderSize = 16*1024; ///< on-disk db header size }; /// initializes shared memory segments used by Rock::SwapDir