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

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,7 +76,7 @@ hsBool plUnifiedTime::SetFromWinFileTime(const FILETIME ft)
if (ffsecs >= MAGICWINDOWSOFFSET) // make sure we won't end up negatice
{
fSecs = (time_t)(ffsecs-MAGICWINDOWSOFFSET);
fMicros = (UInt32)(ff % 10000000)/10;
fMicros = (uint32_t)(ff % 10000000)/10;
return true;
}
else
@ -248,7 +248,7 @@ void plUnifiedTime::SetSecsDouble(double secs)
double x,y;
x = modf(secs,&y);
fSecs = (time_t)y;
fMicros = (UInt32)(x*1000000);
fMicros = (uint32_t)(x*1000000);
}
@ -380,7 +380,7 @@ double plUnifiedTime::GetSecsDouble() const
void plUnifiedTime::Read(hsStream* s)
{
s->LogSubStreamStart("UnifiedTime");
UInt32 secs;
uint32_t secs;
s->LogReadLE(&secs,"Seconds");
fSecs = (time_t)secs;
s->LogReadLE(&fMicros,"MicroSeconds");
@ -390,7 +390,7 @@ void plUnifiedTime::Read(hsStream* s)
void plUnifiedTime::Write(hsStream* s) const
{
s->WriteLE((UInt32)fSecs);
s->WriteLE((uint32_t)fSecs);
s->WriteLE(fMicros);
// preserve fMode
}
@ -1004,9 +1004,9 @@ bool plUnifiedTime::FromString(const char * buf, const char * fmt)
/// Local time zone offset stuff
Int32 plUnifiedTime::fLocalTimeZoneOffset = -1;
int32_t plUnifiedTime::fLocalTimeZoneOffset = -1;
Int32 plUnifiedTime::IGetLocalTimeZoneOffset( void )
int32_t plUnifiedTime::IGetLocalTimeZoneOffset( void )
{
static bool inited = false;
@ -1026,7 +1026,7 @@ Int32 plUnifiedTime::IGetLocalTimeZoneOffset( void )
double diffInSecs = difftime( utc, currLocalTime );
fLocalTimeZoneOffset = (Int32)diffInSecs;
fLocalTimeZoneOffset = (int32_t)diffInSecs;
}
return fLocalTimeZoneOffset;

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

@ -76,14 +76,14 @@ public:
protected:
time_t fSecs;
UInt32 fMicros;
uint32_t fMicros;
Mode fMode;
static Int32 fLocalTimeZoneOffset;
static int32_t fLocalTimeZoneOffset;
struct tm * IGetTime(const time_t * timer) const;
static Int32 IGetLocalTimeZoneOffset( void );
static int32_t IGetLocalTimeZoneOffset( void );
public:
plUnifiedTime() : fSecs(0),fMicros(0), fMode(kGmt) { } // set ToEpoch() at start
@ -109,7 +109,7 @@ public:
// getters
time_t GetSecs() const { return fSecs; }
UInt32 GetMicros() const { return fMicros; }
uint32_t GetMicros() const { return fMicros; }
double GetSecsDouble() const; // get the secs and micros as a double floating point value
hsBool GetTime(short &year, short &month, short &day, short &hour, short &minute, short &second) const;
struct tm * GetTm(struct tm * ptm=nil) const;
@ -126,7 +126,7 @@ public:
// setters
void SetSecs(const time_t secs) { fSecs = secs; }
void SetSecsDouble(double secs);
void SetMicros(const UInt32 micros) { fMicros = micros; }
void SetMicros(const uint32_t micros) { fMicros = micros; }
hsBool SetTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
hsBool SetGMTime(short year, short month, short day, short hour, short minute, short second, unsigned long usec=0, int dst=-1);
hsBool SetToUTC();