FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Bryan THRALL
2001-10-16 20:56:46 +00:00
parent 2ce6cdd6b2
commit a203a1b127
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/FrameStamp
View File

@@ -38,8 +38,8 @@ class SG_EXPORT FrameStamp : public Referenced
void setReferenceTime(double refTime) { _referenceTime = refTime; }
double getReferenceTime() const { return _referenceTime; }
void setCalanderTime(const tm& calanderTime);
void getCalanderTime(tm& calanderTime) const;
void setCalanderTime(const std::tm& calanderTime);
void getCalanderTime(std::tm& calanderTime) const;
protected:

8
include/osg/Timer
View File

@@ -18,7 +18,7 @@ namespace osg {
typedef unsigned long long Timer_t;
#elif defined(unix)
typedef unsigned long long Timer_t;
#elif defined __APPLE__ // MACOSX PJA
#elif defined __APPLE__ || defined macintosh
typedef double Timer_t;
#else
#include <ctime>
@@ -33,12 +33,12 @@ class SG_EXPORT Timer {
Timer();
~Timer() {}
#ifdef __APPLE__
#if defined __APPLE__ || defined macintosh
// PJA MAC OSX - inline Tick() pollutes namespace so badly
// we cant compile, due to Carbon.h ...
Timer_t tick();
#else
inline Timer_t tick();
inline Timer_t tick();
#endif
inline double delta_s( Timer_t t1, Timer_t t2 ) const { return (double)(t2 - t1)*_secsPerClick; }
@@ -150,7 +150,7 @@ namespace osg{
}
};
#elif !defined (__APPLE_CC__)
#elif !defined (__APPLE_CC__) && !defined (macintosh)
// no choice, always use std::clock()