diff options
Diffstat (limited to 'src/inc/stresslog.h')
| -rw-r--r-- | src/inc/stresslog.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/inc/stresslog.h b/src/inc/stresslog.h index f98f071b74..e4e13369bd 100644 --- a/src/inc/stresslog.h +++ b/src/inc/stresslog.h @@ -331,49 +331,49 @@ public: static void LogMsgOL(const char* format, T1 data1) { static_assert_no_msg(sizeof(T1) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 1, format, (void*)data1); + LogMsg(LL_ALWAYS, LF_GC, 1, format, (void*)(size_t)data1); } template < typename T1, typename T2 > static void LogMsgOL(const char* format, T1 data1, T2 data2) { static_assert_no_msg(sizeof(T1) <= sizeof(void*) && sizeof(T2) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 2, format, (void*)data1, (void*)data2); + LogMsg(LL_ALWAYS, LF_GC, 2, format, (void*)(size_t)data1, (void*)(size_t)data2); } template < typename T1, typename T2, typename T3 > static void LogMsgOL(const char* format, T1 data1, T2 data2, T3 data3) { static_assert_no_msg(sizeof(T1) <= sizeof(void*) && sizeof(T2) <= sizeof(void*) && sizeof(T3) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 3, format, (void*)data1, (void*)data2, (void*)data3); + LogMsg(LL_ALWAYS, LF_GC, 3, format, (void*)(size_t)data1, (void*)(size_t)data2, (void*)(size_t)data3); } template < typename T1, typename T2, typename T3, typename T4 > static void LogMsgOL(const char* format, T1 data1, T2 data2, T3 data3, T4 data4) { static_assert_no_msg(sizeof(T1) <= sizeof(void*) && sizeof(T2) <= sizeof(void*) && sizeof(T3) <= sizeof(void*) && sizeof(T4) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 4, format, (void*)data1, (void*)data2, (void*)data3, (void*)data4); + LogMsg(LL_ALWAYS, LF_GC, 4, format, (void*)(size_t)data1, (void*)(size_t)data2, (void*)(size_t)data3, (void*)(size_t)data4); } template < typename T1, typename T2, typename T3, typename T4, typename T5 > static void LogMsgOL(const char* format, T1 data1, T2 data2, T3 data3, T4 data4, T5 data5) { static_assert_no_msg(sizeof(T1) <= sizeof(void*) && sizeof(T2) <= sizeof(void*) && sizeof(T3) <= sizeof(void*) && sizeof(T4) <= sizeof(void*) && sizeof(T5) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 5, format, (void*)data1, (void*)data2, (void*)data3, (void*)data4, (void*)data5); + LogMsg(LL_ALWAYS, LF_GC, 5, format, (void*)(size_t)data1, (void*)(size_t)data2, (void*)(size_t)data3, (void*)(size_t)data4, (void*)(size_t)data5); } template < typename T1, typename T2, typename T3, typename T4, typename T5, typename T6 > static void LogMsgOL(const char* format, T1 data1, T2 data2, T3 data3, T4 data4, T5 data5, T6 data6) { static_assert_no_msg(sizeof(T1) <= sizeof(void*) && sizeof(T2) <= sizeof(void*) && sizeof(T3) <= sizeof(void*) && sizeof(T4) <= sizeof(void*) && sizeof(T5) <= sizeof(void*) && sizeof(T6) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 6, format, (void*)data1, (void*)data2, (void*)data3, (void*)data4, (void*)data5, (void*)data6); + LogMsg(LL_ALWAYS, LF_GC, 6, format, (void*)(size_t)data1, (void*)(size_t)data2, (void*)(size_t)data3, (void*)(size_t)data4, (void*)(size_t)data5, (void*)(size_t)data6); } template < typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7 > static void LogMsgOL(const char* format, T1 data1, T2 data2, T3 data3, T4 data4, T5 data5, T6 data6, T7 data7) { static_assert_no_msg(sizeof(T1) <= sizeof(void*) && sizeof(T2) <= sizeof(void*) && sizeof(T3) <= sizeof(void*) && sizeof(T4) <= sizeof(void*) && sizeof(T5) <= sizeof(void*) && sizeof(T6) <= sizeof(void*) && sizeof(T7) <= sizeof(void*)); - LogMsg(LL_ALWAYS, LF_GC, 7, format, (void*)data1, (void*)data2, (void*)data3, (void*)data4, (void*)data5, (void*)data6, (void*)data7); + LogMsg(LL_ALWAYS, LF_GC, 7, format, (void*)(size_t)data1, (void*)(size_t)data2, (void*)(size_t)data3, (void*)(size_t)data4, (void*)(size_t)data5, (void*)(size_t)data6, (void*)(size_t)data7); } #ifdef _MSC_VER @@ -460,7 +460,7 @@ struct StressLogChunk #if !defined(STRESS_LOG_READONLY) static HANDLE s_LogChunkHeap; - void * operator new (size_t) + void * operator new (size_t) throw() { if (IsInCantAllocStressLogRegion ()) { |