TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1161 from BeamNG/fix_x64_2

Browse source 
More x64 fixes - 2
This commit is contained in:
Luis Anton Rebollo 2015-02-07 17:05:23 +01:00
commit 514579c39b
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/console/engineTypes.h
View file

@ -571,7 +571,7 @@ namespace _Private {
/// ///
#define FIELD_AS( type, fieldName, exportName, numElements, doc ) \ #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 ) \ #define FIELDOFFSET( fieldName ) \

2
Engine/source/platform/platformIntrinsics.h
View file

@ -40,7 +40,7 @@
template< typename T > template< typename T >
inline bool dCompareAndSwap( T* volatile& refPtr, T* oldPtr, T* newPtr ) 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 // Test-And-Set

6
Engine/source/platform/typetraits.h
View file

@ -222,11 +222,11 @@ struct _TypeTraits< T* >
typedef _DestructPtr Destruct; typedef _DestructPtr Destruct;
template< typename A > 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 > 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 > 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 > template< typename T >

2
Engine/source/windowManager/win32/win32WindowMgr.cpp
View file

@ -138,7 +138,7 @@ void Win32WindowManager::buildMonitorsList()
mMonitors.clear(); mMonitors.clear();
// Enumerate all monitors // Enumerate all monitors
EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (size_t)(void*)&mMonitors); EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (uintptr_t)&mMonitors);
} }
S32 Win32WindowManager::findFirstMatchingMonitor(const char* name) S32 Win32WindowManager::findFirstMatchingMonitor(const char* name)