Reverted Bryan's changes to FrameStamp w.r.t std::tm structure which doesn't
compile under Win32 and IRIX. Will need to find another solution.
This commit is contained in:
parent
557e2d8faa
commit
60d33f91f8
@ -38,8 +38,8 @@ class SG_EXPORT FrameStamp : public Referenced
|
||||
void setReferenceTime(double refTime) { _referenceTime = refTime; }
|
||||
double getReferenceTime() const { return _referenceTime; }
|
||||
|
||||
void setCalanderTime(const std::tm& calanderTime);
|
||||
void getCalanderTime(std::tm& calanderTime) const;
|
||||
void setCalanderTime(const tm& calanderTime);
|
||||
void getCalanderTime(tm& calanderTime) const;
|
||||
|
||||
protected:
|
||||
|
||||
|
@ -47,7 +47,7 @@ FrameStamp& FrameStamp::operator = (const FrameStamp& fs)
|
||||
return *this;
|
||||
}
|
||||
|
||||
void FrameStamp::setCalanderTime(const std::tm& ct)
|
||||
void FrameStamp::setCalanderTime(const tm& ct)
|
||||
{
|
||||
tm_sec = ct.tm_sec; /* Seconds. [0-60] (1 leap second) */
|
||||
tm_min = ct.tm_min; /* Minutes. [0-59] */
|
||||
@ -60,7 +60,7 @@ void FrameStamp::setCalanderTime(const std::tm& ct)
|
||||
tm_isdst = ct.tm_isdst; /* DST. [-1/0/1]*/
|
||||
}
|
||||
|
||||
void FrameStamp::getCalanderTime(std::tm& ct) const
|
||||
void FrameStamp::getCalanderTime(tm& ct) const
|
||||
{
|
||||
ct.tm_sec = tm_sec; /* Seconds. [0-60] (1 leap second) */
|
||||
ct.tm_min = tm_min; /* Minutes. [0-59] */
|
||||
|
Loading…
Reference in New Issue
Block a user