From 60d33f91f8eef6900eb30b6fe87e82a445db3370 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 16 Oct 2001 21:47:47 +0000 Subject: [PATCH] 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. --- include/osg/FrameStamp | 4 ++-- src/osg/FrameStamp.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osg/FrameStamp b/include/osg/FrameStamp index ba740760c..889d358d8 100644 --- a/include/osg/FrameStamp +++ b/include/osg/FrameStamp @@ -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: diff --git a/src/osg/FrameStamp.cpp b/src/osg/FrameStamp.cpp index 4d22b5d06..79774412d 100644 --- a/src/osg/FrameStamp.cpp +++ b/src/osg/FrameStamp.cpp @@ -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] */