Fix for build problems with LLTrace::AccumulatorBuffer copy ctor in VS2013 (only)

1 files changed, 22 insertions, 10 deletions

diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h
index 42fad8a793..6e048535e3 100644
--- a/indra/llcommon/lltraceaccumulators.h
+++ b/indra/llcommon/lltraceaccumulators.h
@@ -62,16 +62,16 @@ namespace LLTrace
 		{}
 
 	public:
-
-		AccumulatorBuffer(const AccumulatorBuffer& other = *getDefaultBuffer())
-		:	mStorageSize(0),
-			mStorage(NULL)
-		{
-			resize(sNextStorageSlot);
-			for (S32 i = 0; i < sNextStorageSlot; i++)
-			{
-				mStorage[i] = other.mStorage[i];
-			}
+		AccumulatorBuffer()

+			: mStorageSize(0),

+			mStorage(NULL)

+		{

+			const AccumulatorBuffer& other = *getDefaultBuffer();

+			resize(sNextStorageSlot);

+			for (S32 i = 0; i < sNextStorageSlot; i++)

+			{

+				mStorage[i] = other.mStorage[i];

+			}

 		}
 
 		~AccumulatorBuffer()
@@ -93,6 +93,18 @@ namespace LLTrace
 			return mStorage[index]; 
 		}
 
+
+		AccumulatorBuffer(const AccumulatorBuffer& other)

+			: mStorageSize(0),

+			mStorage(NULL)

+		{

+			resize(sNextStorageSlot);

+			for (S32 i = 0; i < sNextStorageSlot; i++)

+			{

+				mStorage[i] = other.mStorage[i];

+			}

+		}

+
 		void addSamples(const AccumulatorBuffer<ACCUMULATOR>& other, EBufferAppendType append_type)
 		{
 			llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot);