From 9e6f2003002594518a6f09cd1423a3655c41b0ca Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Mon, 27 Oct 2014 15:33:52 -0700 Subject: [PATCH] fix a couple more, maybe --- .../library/sharedDebug/src/shared/CallStackCollector.cpp | 2 +- engine/shared/library/sharedFoundation/src/win32/Os.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp b/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp index d3530f68..9e91cbb4 100644 --- a/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp +++ b/engine/shared/library/sharedDebug/src/shared/CallStackCollector.cpp @@ -141,7 +141,7 @@ void CallStackCollectorNamespace::Node::addCallStack(uint32 * const callStack) { //-- Create new callstack uint32 * const newCallStack = new uint32[CALLSTACK_DEPTH]; - memcpy(newCallStack, callStack, (*newCallStack)); + memcpy(newCallStack, callStack, sizeof(*newCallStack)); CallStackEntry callStackEntry; callStackEntry.m_callStack = newCallStack; diff --git a/engine/shared/library/sharedFoundation/src/win32/Os.cpp b/engine/shared/library/sharedFoundation/src/win32/Os.cpp index 48322c7a..f80effe3 100644 --- a/engine/shared/library/sharedFoundation/src/win32/Os.cpp +++ b/engine/shared/library/sharedFoundation/src/win32/Os.cpp @@ -1599,7 +1599,6 @@ bool Os::getUserName(char *buffer, int &bufferSize) DWORD windowsBufferSize = static_cast(bufferSize); buffer[0] = '\0'; bool result = GetUserName(buffer, &windowsBufferSize) == TRUE; - bufferSize = static_cast(bufferSize); return result; }