From dbbd46d97b19f44d34e16c92a070be51444c58a3 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli <5175948+kinkie@users.noreply.github.com> Date: Sun, 19 May 2024 07:44:59 +0000 Subject: [PATCH] Fix build with clang v18 [-Wvla-cxx-extension] (#1813) 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 --- src/fs/rock/RockSwapDir.cc | 2 -- src/fs/rock/RockSwapDir.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc index c9403e50fa..20426ca4d2 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 -- 2.39.5