Skip to content
Snippets Groups Projects
Commit 3d94afaf authored by callum_linden's avatar callum_linden
Browse files

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

parent 23711c92
No related branches found
No related tags found
No related merge requests found
...@@ -62,16 +62,16 @@ namespace LLTrace ...@@ -62,16 +62,16 @@ namespace LLTrace
{} {}
public: public:
AccumulatorBuffer()
AccumulatorBuffer(const AccumulatorBuffer& other = *getDefaultBuffer()) : mStorageSize(0),
: mStorageSize(0), mStorage(NULL)
mStorage(NULL) {
{ const AccumulatorBuffer& other = *getDefaultBuffer();
resize(sNextStorageSlot); resize(sNextStorageSlot);
for (S32 i = 0; i < sNextStorageSlot; i++) for (S32 i = 0; i < sNextStorageSlot; i++)
{ {
mStorage[i] = other.mStorage[i]; mStorage[i] = other.mStorage[i];
} }
} }
~AccumulatorBuffer() ~AccumulatorBuffer()
...@@ -93,6 +93,18 @@ namespace LLTrace ...@@ -93,6 +93,18 @@ namespace LLTrace
return mStorage[index]; 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) void addSamples(const AccumulatorBuffer<ACCUMULATOR>& other, EBufferAppendType append_type)
{ {
llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot); llassert(mStorageSize >= sNextStorageSlot && other.mStorageSize >= sNextStorageSlot);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment