From 318474d675a58b40a9b43b6de8b7ad0b66c77f46 Mon Sep 17 00:00:00 2001 From: Mike Goslin Date: Tue, 20 Feb 2001 23:53:35 +0000 Subject: [PATCH] *** empty log message *** --- panda/src/express/clockObject.I | 29 +++++++++++++++++++++++++++++ panda/src/express/clockObject.cxx | 9 --------- panda/src/express/clockObject.h | 4 +++- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/panda/src/express/clockObject.I b/panda/src/express/clockObject.I index 118b2385f1..cd91471057 100644 --- a/panda/src/express/clockObject.I +++ b/panda/src/express/clockObject.I @@ -233,3 +233,32 @@ INLINE void ClockObject:: set_time(double time) { set_real_time(time); } + +//////////////////////////////////////////////////////////////////// +// Function: TimeVal::contructor +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE TimeVal:: +TimeVal(void) { +} + +//////////////////////////////////////////////////////////////////// +// Function: TimeVal::get_sec +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE ulong TimeVal:: +get_sec(void) const { + return tv[0]; +} + +//////////////////////////////////////////////////////////////////// +// Function: TimeVal::get_usec +// Access: Public +// Description: +//////////////////////////////////////////////////////////////////// +INLINE ulong TimeVal:: +get_usec(void) const { + return tv[1]; +} diff --git a/panda/src/express/clockObject.cxx b/panda/src/express/clockObject.cxx index 48a3cfcf8c..07819b4989 100644 --- a/panda/src/express/clockObject.cxx +++ b/panda/src/express/clockObject.cxx @@ -53,15 +53,6 @@ tick() { _frame_count++; } -//////////////////////////////////////////////////////////////////// -// Function: TimeVal::contructor -// Access: Public -// Description: -//////////////////////////////////////////////////////////////////// -TimeVal:: -TimeVal(void) { -} - //////////////////////////////////////////////////////////////////// // Function: get_time_of_day // Description: diff --git a/panda/src/express/clockObject.h b/panda/src/express/clockObject.h index 7d3d8f3da3..8ad88a4114 100644 --- a/panda/src/express/clockObject.h +++ b/panda/src/express/clockObject.h @@ -13,7 +13,9 @@ class EXPCL_PANDAEXPRESS TimeVal { PUBLISHED: - TimeVal(); + INLINE TimeVal(void); + INLINE ulong get_sec(void) const; + INLINE ulong get_usec(void) const; ulong tv[2]; };