Merge Randall's changes.

2002-06-13 18:27:14 +00:00
parent 0ebe473eb5
commit 4e5a3696e3
2 changed files with 21 additions and 14 deletions
--- a/include/osg/Timer
+++ b/include/osg/Timer
@@ -63,11 +63,11 @@ class SG_EXPORT Timer {
        double                  _secsPerClick;
        bool                    _useStandardClock;
       
-        #ifdef __sgi
-        unsigned long*          _clockAddress;
+#       ifdef __sgi
+        unsigned long*          _clockAddress_32;
+        unsigned long long*     _clockAddress_64;
        int                     _cycleCntrSize;
-        static unsigned long    _dummy;
-        #endif
+#       endif
        
 };

@@ -164,7 +164,10 @@ class SG_EXPORT Timer {
            }
            else
            {
-                return *_clockAddress;
+                if ( _clockAddress_64 )
+                    return *_clockAddress_64;
+                else
+                    return *_clockAddress_32;
            }
        }
    }