From 970fbdbeb80f20811fb286f6731b854f9b20a76e Mon Sep 17 00:00:00 2001
From: Xiaohong Bao <bao@lindenlab.com>
Date: Tue, 15 Jan 2013 20:28:05 -0700
Subject: a minor change to LLTrace::ExtendableRecording, make its functions
 public.

---
 indra/llcommon/lltracerecording.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index aa3200e5ad..5105874ba1 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -390,6 +390,7 @@ namespace LLTrace
 	class ExtendableRecording
 	:	public LLStopWatchControlsMixin<ExtendableRecording>
 	{
+	public:
 		void extend();
 
 		// implementation for LLStopWatchControlsMixin
@@ -401,6 +402,8 @@ namespace LLTrace
 		/*virtual*/ void reset();
 		/*virtual*/ void splitTo(ExtendableRecording& other);
 		/*virtual*/ void splitFrom(ExtendableRecording& other);
+
+		const Recording& getAcceptedRecording() const {return mAcceptedRecording;}
 	private:
 		Recording mAcceptedRecording;
 		Recording mPotentialRecording;
-- 
cgit v1.2.3


From cf4798b8f90eebaa62dcb8817538f1e3965b6bc9 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 22 Mar 2013 14:00:09 -0700
Subject: BUILDFIX gcc and vc fixes

---
 indra/llcommon/lltracerecording.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index b70d42b082..f78b7942a7 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -116,12 +116,12 @@ void RecordingBuffers::mergeBuffers( const RecordingBuffers& other)
 
 void RecordingBuffers::resetBuffers(RecordingBuffers* other)
 {
-	mCountsFloat.write()->reset(other ? other->mCountsFloat : NULL);
-	mMeasurementsFloat.write()->reset(other ? other->mMeasurementsFloat : NULL);
-	mCounts.write()->reset(other ? other->mCounts : NULL);
-	mMeasurements.write()->reset(other ? other->mMeasurements : NULL);
-	mStackTimers.write()->reset(other ? other->mStackTimers : NULL);
-	mMemStats.write()->reset(other ? other->mMemStats : NULL);
+	mCountsFloat.write()->reset(other ? other->mCountsFloat : LLCopyOnWritePointer<AccumulatorBuffer<CountAccumulator<F64> > >());
+	mMeasurementsFloat.write()->reset(other ? other->mMeasurementsFloat : LLCopyOnWritePointer<AccumulatorBuffer<MeasurementAccumulator<F64> > >());
+	mCounts.write()->reset(other ? other->mCounts : LLCopyOnWritePointer<AccumulatorBuffer<CountAccumulator<S64> > >());
+	mMeasurements.write()->reset(other ? other->mMeasurements : LLCopyOnWritePointer<AccumulatorBuffer<MeasurementAccumulator<S64> > >());
+	mStackTimers.write()->reset(other ? other->mStackTimers : LLCopyOnWritePointer<AccumulatorBuffer<TimeBlockAccumulator> >());
+	mMemStats.write()->reset(other ? other->mMemStats : LLCopyOnWritePointer<AccumulatorBuffer<MemStatAccumulator> >());
 }
 
 ///////////////////////////////////////////////////////////////////////
-- 
cgit v1.2.3


From cd46f3d08cef6f43c29447e36c920d10ec184a18 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 25 Mar 2013 20:21:04 -0700
Subject: BUILDFIX gcc fix

---
 indra/llcommon/llfasttimer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index fbffe133f1..b40aec4886 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -185,7 +185,7 @@ void TimeBlock::processTimes()
 	U64 cur_time = getCPUClockCount64();
 
 	// set up initial tree
-	for (LLInstanceTracker<TimeBlock>::instance_iter it = LLInstanceTracker<TimeBlock>::beginInstances(), end_it = LLInstanceTracker<TimeBlock>::endInstances(); 
+	for (LLInstanceTracker<TimeBlock>::instance_iter begin_it = LLInstanceTracker<TimeBlock>::beginInstances(), end_it = LLInstanceTracker<TimeBlock>::endInstances(), it = begin_it; 
 		it != end_it; 
 		++it)
 	{
-- 
cgit v1.2.3