OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 19:29:09 +00:00
Code Releases Activity

Fix UnifiedTime collision

Browse Source 
Win32's GetCurrentTime and plUnifiedTime::GetCurrentTime collided. Rather
than hacking around the solution by undefining GetCurrentTime, we rename
plUnifiedTime::GetCurrentTime to plUnifiedTime::GetCurrent. This fix is
less fiddly than an undef hack.
This commit is contained in:
Adam Johnson
2012-12-21 21:00:03 -05:00
parent c8419b0107
commit 5de87cdaca
9 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/Plasma/PubUtilLib/plUnifiedTime/plClientUnifiedTime.cpp
View File

@ -50,7 +50,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#endif
// static
plUnifiedTime plClientUnifiedTime::fFrameStartTime = plUnifiedTime::GetCurrentTime(); // the 'current time' at the start of each time
plUnifiedTime plClientUnifiedTime::fFrameStartTime = plUnifiedTime::GetCurrent(); // the 'current time' at the start of each time
double plClientUnifiedTime::fSysTimeOffset = 0.0;
//
@ -78,7 +78,7 @@ void plClientUnifiedTime::SetFromGameTime(double gameTime, double curGameSecs)
extern bool gMooseDump;
if (gMooseDump)
{
plUnifiedTime ct = plUnifiedTime::GetCurrentTime();
plUnifiedTime ct = plUnifiedTime::GetCurrent();
plUnifiedTime ft = GetFrameStartTime();
plNetObjectDebugger::GetInstance()->LogMsg(hsTempStringF("SFGT: CT=%s\n", ct.PrintWMillis()));
@ -102,7 +102,7 @@ void plClientUnifiedTime::ConvertToGameTime(double* gameTimeOut, double curGameS
extern bool gMooseDump;
if (gMooseDump)
{
plUnifiedTime ct = plUnifiedTime::GetCurrentTime();
plUnifiedTime ct = plUnifiedTime::GetCurrent();
plUnifiedTime ft = GetFrameStartTime();
plNetObjectDebugger::GetInstance()->LogMsg( hsTempStringF("CTGT: this=%s\n", PrintWMillis()));

2
Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.cpp
View File

@ -193,7 +193,7 @@ plUnifiedTime::plUnifiedTime(const plUnifiedTime * src)
*this = *src;
}
plUnifiedTime plUnifiedTime::GetCurrentTime(Mode mode)
plUnifiedTime plUnifiedTime::GetCurrent(Mode mode)
{
plUnifiedTime t;
t.SetMode(mode);

11
Sources/Plasma/PubUtilLib/plUnifiedTime/plUnifiedTime.h
View File

@ -39,14 +39,15 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
Mead, WA 99021
*==LICENSE==*/
#ifndef _PL_UNIFIEDTIME_INC_
#define _PL_UNIFIEDTIME_INC_
#include "HeadSpin.h"
#include "hsStlUtils.h"
#include <string>
#if HS_BUILD_FOR_WIN32
typedef struct _FILETIME FILETIME;
#endif
//
@ -58,10 +59,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
struct timeval;
class hsStream;
#ifdef GetCurrentTime
#undef GetCurrentTime
#endif
enum plUnifiedTime_CtorNow { kNow };
@ -97,7 +94,7 @@ public:
plUnifiedTime(int mode, const char * buf, const char * fmt);
plUnifiedTime(const plUnifiedTime & src);
plUnifiedTime(const plUnifiedTime * src);
static plUnifiedTime GetCurrentTime(Mode mode=kGmt);
static plUnifiedTime GetCurrent(Mode mode=kGmt);
// assignment
const plUnifiedTime & operator=(const plUnifiedTime & src);