diff --git a/aeron-client/src/main/cpp/concurrent/logbuffer/LogBufferDescriptor.h b/aeron-client/src/main/cpp/concurrent/logbuffer/LogBufferDescriptor.h
index 0831f794e7..5b84f813b6 100644
--- a/aeron-client/src/main/cpp/concurrent/logbuffer/LogBufferDescriptor.h
+++ b/aeron-client/src/main/cpp/concurrent/logbuffer/LogBufferDescriptor.h
@@ -270,7 +270,7 @@ inline static int indexByTermCount(std::int64_t termCount) AERON_NOEXCEPT
 
 inline static int indexByPosition(std::int64_t position, std::int32_t positionBitsToShift) AERON_NOEXCEPT
 {
-    return (int)((std::uint64_t)position >> positionBitsToShift) % PARTITION_COUNT;
+    return static_cast<int>(((std::uint64_t)position >> positionBitsToShift) % PARTITION_COUNT);
 }
 
 inline static std::int64_t computePosition(