diff options
| author | callum_linden <none@none> | 2014-12-15 10:10:38 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2014-12-15 10:10:38 -0800 |
| commit | d23803c74eb154360ae7ea7f48df1b00615fae52 (patch) | |
| tree | 53a2a5e59ae0e55774bb4cc98725467cd70a9f10 /indra | |
| parent | 71c70117dda651700b5c564366f6c91d12512f97 (diff) | |
| parent | eb5c0dd32a7f4e4a603fe88cfa5f18c30725d11a (diff) | |
Merge with head
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.h | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/indra/llcommon/lltraceaccumulators.h b/indra/llcommon/lltraceaccumulators.h index 6e048535e3..6f27b97dff 100644 --- a/indra/llcommon/lltraceaccumulators.h +++ b/indra/llcommon/lltraceaccumulators.h @@ -62,16 +62,16 @@ namespace LLTrace {} public: - AccumulatorBuffer()
- : mStorageSize(0),
- mStorage(NULL)
- {
- const AccumulatorBuffer& other = *getDefaultBuffer();
- 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() @@ -94,16 +94,16 @@ namespace LLTrace } - AccumulatorBuffer(const AccumulatorBuffer& other)
- : mStorageSize(0),
- mStorage(NULL)
- {
- resize(sNextStorageSlot);
- for (S32 i = 0; i < sNextStorageSlot; i++)
- {
- mStorage[i] = other.mStorage[i];
- }
- }
+ 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) { |