aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/Kernel/OVR_Allocator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'LibOVR/Src/Kernel/OVR_Allocator.cpp')
-rw-r--r--LibOVR/Src/Kernel/OVR_Allocator.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/LibOVR/Src/Kernel/OVR_Allocator.cpp b/LibOVR/Src/Kernel/OVR_Allocator.cpp
index 0f82561..1dc3326 100644
--- a/LibOVR/Src/Kernel/OVR_Allocator.cpp
+++ b/LibOVR/Src/Kernel/OVR_Allocator.cpp
@@ -39,25 +39,25 @@ namespace OVR {
Allocator* Allocator::pInstance = 0;
// Default AlignedAlloc implementation will delegate to Alloc/Free after doing rounding.
-void* Allocator::AllocAligned(UPInt size, UPInt align)
+void* Allocator::AllocAligned(size_t size, size_t align)
{
OVR_ASSERT((align & (align-1)) == 0);
- align = (align > sizeof(UPInt)) ? align : sizeof(UPInt);
- UPInt p = (UPInt)Alloc(size+align);
- UPInt aligned = 0;
+ align = (align > sizeof(size_t)) ? align : sizeof(size_t);
+ size_t p = (size_t)Alloc(size+align);
+ size_t aligned = 0;
if (p)
{
- aligned = (UPInt(p) + align-1) & ~(align-1);
+ aligned = (size_t(p) + align-1) & ~(align-1);
if (aligned == p)
aligned += align;
- *(((UPInt*)aligned)-1) = aligned-p;
+ *(((size_t*)aligned)-1) = aligned-p;
}
return (void*)aligned;
}
void Allocator::FreeAligned(void* p)
{
- UPInt src = UPInt(p) - *(((UPInt*)p)-1);
+ size_t src = size_t(p) - *(((size_t*)p)-1);
Free((void*)src);
}
@@ -68,11 +68,11 @@ void Allocator::FreeAligned(void* p)
// This allocator is created and used if no other allocator is installed.
// Default allocator delegates to system malloc.
-void* DefaultAllocator::Alloc(UPInt size)
+void* DefaultAllocator::Alloc(size_t size)
{
return malloc(size);
}
-void* DefaultAllocator::AllocDebug(UPInt size, const char* file, unsigned line)
+void* DefaultAllocator::AllocDebug(size_t size, const char* file, unsigned line)
{
#if defined(OVR_CC_MSVC) && defined(_CRTDBG_MAP_ALLOC)
return _malloc_dbg(size, _NORMAL_BLOCK, file, line);
@@ -82,7 +82,7 @@ void* DefaultAllocator::AllocDebug(UPInt size, const char* file, unsigned line)
#endif
}
-void* DefaultAllocator::Realloc(void* p, UPInt newSize)
+void* DefaultAllocator::Realloc(void* p, size_t newSize)
{
return realloc(p, newSize);
}