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 | |
| parent | 71c70117dda651700b5c564366f6c91d12512f97 (diff) | |
| parent | eb5c0dd32a7f4e4a603fe88cfa5f18c30725d11a (diff) | |
Merge with head
| -rwxr-xr-x | autobuild.xml | 42 | ||||
| -rw-r--r-- | indra/llcommon/lltraceaccumulators.h | 40 |
2 files changed, 23 insertions, 59 deletions
diff --git a/autobuild.xml b/autobuild.xml index c59632ed62..31741a62db 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -374,52 +374,16 @@ <key>archive</key> <map> <key>hash</key> - <string>1f300f7b8600a18cd4c958841bfa2a95</string> + <string>a62723a6deea8187702a2f926e98a35f</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/oz-metadata_3p-dictionaries/rev/292421/arch/Linux/installer/dictionaries-1-common-292421.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/297347/arch/Linux/installer/dictionaries-1.297347-common-297347.tar.bz2</string> </map> <key>name</key> <string>common</string> </map> - <key>darwin</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>b6bd4bcd1eb04af52fe3525dde5f81cf</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/296922/arch/Darwin/installer/dictionaries-1.296922-darwin-296922.tar.bz2</string> - </map> - <key>name</key> - <string>darwin</string> - </map> - <key>linux</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>7cdc32c78e572cea64f4047ff2e0e29e</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/296922/arch/Linux/installer/dictionaries-1.296922-linux-296922.tar.bz2</string> - </map> - <key>name</key> - <string>linux</string> - </map> - <key>windows</key> - <map> - <key>archive</key> - <map> - <key>hash</key> - <string>b0e66bcb304bef0c7715e0475529f7a8</string> - <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/dictionaries_3p-update-dictionaries/rev/296922/arch/CYGWIN/installer/dictionaries-1.296922-windows-296922.tar.bz2</string> - </map> - <key>name</key> - <string>windows</string> - </map> </map> <key>version</key> - <string>1.296922</string> + <string>1.297347</string> </map> <key>elfio</key> <map> 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) { |