diff options
| author | Richard Linden <none@none> | 2012-08-30 16:48:05 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-08-30 16:48:05 -0700 |
| commit | f5ce2c2940e1f3c72df8886d95b70ef53554f642 (patch) | |
| tree | a76fcf61a1dc3d1f06ef38bddc9ed782211b2aba /indra/llcommon/llfasttimer.h | |
| parent | d1481a599fa8bd65f505e0bd9dec33370a3c68c8 (diff) | |
| parent | 64201b21b3d02f98969981723ef5426cdbfc16be (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index b0d3ea5d60..07af0f1d4d 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -91,8 +91,8 @@ public: U32 getHistoricalCount(S32 history_index = 0) const; U32 getHistoricalCalls(S32 history_index = 0) const; - void setFrameState(FrameState* state) { mFrameState = state; state->setNamedTimer(this); } - FrameState& getFrameState() const; + const FrameState& getFrameState() const; + FrameState& getFrameState(); private: friend class LLFastTimer; @@ -116,7 +116,7 @@ public: // // members // - FrameState* mFrameState; + FrameState mFrameState; std::string mName; @@ -147,7 +147,7 @@ public: NamedTimer& getNamedTimer() { return mTimer; } private: - FrameState mFrameState; + FrameState* mFrameState; NamedTimer& mTimer; }; @@ -155,7 +155,7 @@ public: LLFastTimer(LLFastTimer::FrameState* state); LL_FORCE_INLINE LLFastTimer(LLFastTimer::DeclareTimer& timer) - : mFrameState(&timer.mFrameState) + : mFrameState(timer.mFrameState) { #if FAST_TIMER_ON LLFastTimer::FrameState* frame_state = mFrameState; @@ -224,7 +224,6 @@ public: static void writeLog(std::ostream& os); static const NamedTimer* getTimerByName(const std::string& name); - static bool checkForDuplicates(std::string& duplicates); struct CurTimerData { |