diff --git a/Engine/source/console/engineTypes.h b/Engine/source/console/engineTypes.h index 9d5a5f005..400a05b50 100644 --- a/Engine/source/console/engineTypes.h +++ b/Engine/source/console/engineTypes.h @@ -571,7 +571,7 @@ namespace _Private { /// #define FIELD_AS( type, fieldName, exportName, numElements, doc ) \ - { #exportName, doc, numElements, TYPE( *( ( type* ) &( ( ThisType* ) 16 )->fieldName ) ), FIELDOFFSET( fieldName ) }, // Artificial offset to avoid compiler warnings. + { #exportName, doc, numElements, TYPE( *( ( type* ) &( ( ThisType* ) 16 )->fieldName ) ), (U32)FIELDOFFSET( fieldName ) }, // Artificial offset to avoid compiler warnings. /// #define FIELDOFFSET( fieldName ) \ diff --git a/Engine/source/platform/platformIntrinsics.h b/Engine/source/platform/platformIntrinsics.h index b63a987be..c480242a2 100644 --- a/Engine/source/platform/platformIntrinsics.h +++ b/Engine/source/platform/platformIntrinsics.h @@ -40,7 +40,7 @@ template< typename T > inline bool dCompareAndSwap( T* volatile& refPtr, T* oldPtr, T* newPtr ) { - return dCompareAndSwap( *reinterpret_cast< volatile size_t* >( &refPtr ), ( size_t ) oldPtr, ( size_t ) newPtr ); + return dCompareAndSwap( *reinterpret_cast< volatile uintptr_t* >( &refPtr ), ( uintptr_t ) oldPtr, ( uintptr_t ) newPtr ); } // Test-And-Set diff --git a/Engine/source/platform/typetraits.h b/Engine/source/platform/typetraits.h index 4183a3f8f..658fdaa83 100644 --- a/Engine/source/platform/typetraits.h +++ b/Engine/source/platform/typetraits.h @@ -222,11 +222,11 @@ struct _TypeTraits< T* > typedef _DestructPtr Destruct; template< typename A > - static bool isTaggedPtr( A* ptr ) { return ( size_t( ptr ) & 0x1 ); } //TODO: 64bits + static bool isTaggedPtr( A* ptr ) { return ( uintptr_t( ptr ) & 0x1 ); } template< typename A > - static A* getTaggedPtr( A* ptr ) { return ( A* ) ( size_t( ptr ) | 0x1 ); } //TODO: 64bits + static A* getTaggedPtr( A* ptr ) { return ( A* ) ( uintptr_t( ptr ) | 0x1 ); } template< typename A > - static A* getUntaggedPtr( A* ptr ) { return ( A* ) ( size_t( ptr ) & (~0x1) ); } //TODO: 64bit + static A* getUntaggedPtr( A* ptr ) { return ( A* ) ( uintptr_t( ptr ) & (~0x1) ); } }; template< typename T > diff --git a/Engine/source/windowManager/win32/win32WindowMgr.cpp b/Engine/source/windowManager/win32/win32WindowMgr.cpp index 4782904ec..fcb25fc59 100644 --- a/Engine/source/windowManager/win32/win32WindowMgr.cpp +++ b/Engine/source/windowManager/win32/win32WindowMgr.cpp @@ -138,7 +138,7 @@ void Win32WindowManager::buildMonitorsList() mMonitors.clear(); // Enumerate all monitors - EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (size_t)(void*)&mMonitors); + EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (uintptr_t)&mMonitors); } S32 Win32WindowManager::findFirstMatchingMonitor(const char* name)