From 5a2ef4d55ed58519a98f47d2cf8df0410331998a Mon Sep 17 00:00:00 2001 From: 0x280 <86424319+0x280@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:52:12 +0100 Subject: [PATCH] resolve std::numeric_limits::max() max(a, b) conflict (#158) --- rage/atArray.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rage/atArray.hpp b/rage/atArray.hpp index 2b3b175..b0b9ca1 100644 --- a/rage/atArray.hpp +++ b/rage/atArray.hpp @@ -63,7 +63,7 @@ namespace rage auto value_array_size = value_array.size(); auto old_capacity = m_count; - if ((value_array_size + m_count) > std::numeric_limits::max()) + if ((value_array_size + m_count) > (std::numeric_limits::max)()) return false; auto size = (uint16_t)value_array_size; @@ -84,7 +84,7 @@ namespace rage auto value_array_size = value_array.size(); auto old_capacity = m_count; - if ((value_array_size + m_count) > std::numeric_limits::max()) + if ((value_array_size + m_count) > (std::numeric_limits::max)()) return false; auto size = (uint16_t)value_array_size; @@ -105,7 +105,7 @@ namespace rage auto value_array_size = value_array.size(); auto old_capacity = m_count; - if ((value_array_size + m_count) > std::numeric_limits::max()) + if ((value_array_size + m_count) > (std::numeric_limits::max)()) return false; auto size = (uint16_t)value_array_size;