From 705844e4bb1a9a4402bceb6acc0761b229a066dc Mon Sep 17 00:00:00 2001 From: Jan Kotas Date: Mon, 18 Apr 2016 10:27:56 -0700 Subject: [PATCH] Fixes for GC update --- src/gc/gc.cpp | 4 ++-- src/vm/gcenv.os.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gc/gc.cpp b/src/gc/gc.cpp index 837c4bb..0ad36aa 100644 --- a/src/gc/gc.cpp +++ b/src/gc/gc.cpp @@ -403,7 +403,7 @@ void log_va_msg(const char *fmt, va_list args) pBuffer[0] = '\n'; int buffer_start = 1; - int pid_len = sprintf_s (&pBuffer[buffer_start], BUFFERSIZE - buffer_start, "[%5lld]", GCToOSInterface::GetCurrentThreadIdForLogging()); + int pid_len = sprintf_s (&pBuffer[buffer_start], BUFFERSIZE - buffer_start, "[%5d]", (uint32_t)GCToOSInterface::GetCurrentThreadIdForLogging()); buffer_start += pid_len; memset(&pBuffer[buffer_start], '-', BUFFERSIZE - buffer_start); int msg_len = _vsnprintf(&pBuffer[buffer_start], BUFFERSIZE - buffer_start, fmt, args ); @@ -27041,7 +27041,7 @@ uint32_t gc_heap::bgc_thread_function() Thread* current_thread = GetThread(); BOOL cooperative_mode = TRUE; bgc_thread_id.SetToCurrentThread(); - dprintf (1, ("bgc_thread_id is set to %llx", GCToOSInterface::GetCurrentThreadIdForLogging())); + dprintf (1, ("bgc_thread_id is set to %x", (uint32_t)GCToOSInterface::GetCurrentThreadIdForLogging())); //this also indicates that the thread is ready. background_gc_create_event.Set(); while (1) diff --git a/src/vm/gcenv.os.cpp b/src/vm/gcenv.os.cpp index 3b2d44f..69ab65d 100644 --- a/src/vm/gcenv.os.cpp +++ b/src/vm/gcenv.os.cpp @@ -39,7 +39,7 @@ void GCToOSInterface::Shutdown() // current platform. It is indended for logging purposes only. // Return: // Numeric id of the current thread or 0 if the -uint32_t GCToOSInterface::GetCurrentThreadIdForLogging() +uint64_t GCToOSInterface::GetCurrentThreadIdForLogging() { LIMITED_METHOD_CONTRACT; return ::GetCurrentThreadId(); -- 2.7.4