summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2024-06-14 13:47:19 -0500
committerGitHub <noreply@github.com>2024-06-14 13:47:19 -0500
commitf4eae44067cfe63fbe5ddd219b1b2463e9de89ef (patch)
treed2326d97462cff679a937e801bb2a1da526f0983 /indra/llcommon/llmemory.h
parent0ed3483b338376b7a18a05efae6fbc1d4b5db870 (diff)
Fix for warnings/errors after Visual Studio update (#1775)
Diffstat (limited to 'indra/llcommon/llmemory.h')
-rw-r--r--indra/llcommon/llmemory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 2c3f66fab8..80cfe554c4 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -134,7 +134,7 @@ public: \
void ll_aligned_free_fallback( void* ptr );
//------------------------------------------------------------------------------------------------
#else
- inline void* ll_aligned_malloc_fallback( size_t size, int align )
+ inline void* ll_aligned_malloc_fallback( size_t size, size_t align )
{
LL_PROFILE_ZONE_SCOPED_CATEGORY_MEMORY;
#if defined(LL_WINDOWS)