From 410c11994e904cce08c328119d10d5aa6a26d0c7 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Mon, 16 Mar 2026 23:58:55 -0700 Subject: [PATCH] [wpiutil] Update MappedFileRegion MapMode enum to all caps --- .../src/main/native/cpp/MappedFileRegion.cpp | 18 +++++++++--------- .../include/wpi/util/MappedFileRegion.hpp | 8 ++++---- .../thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/wpiutil/src/main/native/cpp/MappedFileRegion.cpp b/wpiutil/src/main/native/cpp/MappedFileRegion.cpp index e73bfad27c..c5e40940d4 100644 --- a/wpiutil/src/main/native/cpp/MappedFileRegion.cpp +++ b/wpiutil/src/main/native/cpp/MappedFileRegion.cpp @@ -39,8 +39,8 @@ MappedFileRegion::MappedFileRegion(fs::file_t f, uint64_t length, } HANDLE fileMappingHandle = ::CreateFileMappingW( - f, 0, mapMode == kReadOnly ? PAGE_READONLY : PAGE_READWRITE, length >> 32, - length & 0xffffffff, 0); + f, 0, mapMode == MapMode::READ_ONLY ? PAGE_READONLY : PAGE_READWRITE, + length >> 32, length & 0xffffffff, 0); if (fileMappingHandle == nullptr) { ec = wpi::util::mapWindowsError(GetLastError()); return; @@ -48,13 +48,13 @@ MappedFileRegion::MappedFileRegion(fs::file_t f, uint64_t length, DWORD dwDesiredAccess = 0; switch (mapMode) { - case kReadOnly: + case MapMode::READ_ONLY: dwDesiredAccess = FILE_MAP_READ; break; - case kReadWrite: + case MapMode::READ_WRITE: dwDesiredAccess = FILE_MAP_WRITE; break; - case kPriv: + case MapMode::PRIV: dwDesiredAccess = FILE_MAP_WRITE | FILE_MAP_COPY; break; } @@ -80,10 +80,10 @@ MappedFileRegion::MappedFileRegion(fs::file_t f, uint64_t length, return; } #else - m_mapping = - ::mmap(nullptr, length, - mapMode == kReadOnly ? PROT_READ : (PROT_READ | PROT_WRITE), - mapMode == kPriv ? MAP_PRIVATE : MAP_SHARED, f, offset); + m_mapping = ::mmap( + nullptr, length, + mapMode == MapMode::READ_ONLY ? PROT_READ : (PROT_READ | PROT_WRITE), + mapMode == MapMode::PRIV ? MAP_PRIVATE : MAP_SHARED, f, offset); if (m_mapping == MAP_FAILED) { ec = std::error_code(errno, std::generic_category()); m_mapping = nullptr; diff --git a/wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp b/wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp index 9322236971..55b91c4be2 100644 --- a/wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp +++ b/wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp @@ -22,10 +22,10 @@ namespace wpi::util { class MappedFileRegion { public: - enum MapMode { - kReadOnly, ///< May only access map via const_data as read only. - kReadWrite, ///< May access map via data and modify it. Written to path. - kPriv ///< May modify via data, but changes are lost on destruction. + enum class MapMode { + READ_ONLY, ///< May only access map via const_data as read only. + READ_WRITE, ///< May access map via data and modify it. Written to path. + PRIV ///< May modify via data, but changes are lost on destruction. }; MappedFileRegion() = default; diff --git a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp index 4c97723d08..330f12a014 100644 --- a/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp +++ b/wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp @@ -172,14 +172,14 @@ std::unique_ptr MemoryBuffer::GetFileSlice( namespace { template -constexpr auto kMapMode = MappedFileRegion::kReadOnly; +constexpr auto MAP_MODE = MappedFileRegion::MapMode::READ_ONLY; template <> -constexpr auto kMapMode = MappedFileRegion::kReadOnly; +constexpr auto MAP_MODE = MappedFileRegion::MapMode::READ_ONLY; template <> -constexpr auto kMapMode = MappedFileRegion::kPriv; +constexpr auto MAP_MODE = MappedFileRegion::MapMode::PRIV; template <> -constexpr auto kMapMode = - MappedFileRegion::kReadWrite; +constexpr auto MAP_MODE = + MappedFileRegion::MapMode::READ_WRITE; /// Memory maps a file descriptor using MappedFileRegion. /// @@ -204,7 +204,7 @@ class MemoryBufferMMapFile : public MB { MemoryBufferMMapFile(fs::file_t f, uint64_t len, uint64_t offset, std::error_code& ec) : m_mfr(f, getLegalMapSize(len, offset), getLegalMapOffset(offset), - kMapMode, ec) { + MAP_MODE, ec) { if (!ec) { const uint8_t* Start = getStart(len, offset); MemoryBuffer::Init(Start, Start + len);