diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-22 17:09:37 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-10-22 17:09:37 +0300 |
| commit | ed6943b913bb1affc6049384fa20bcb778f41c07 (patch) | |
| tree | 292b156d16556fbeb6149f2b5a3e853817061f82 /indra/llcommon/llfasttimer.h | |
| parent | 2ec0ccb628e8fa2e8affe27dde4e4dab0906b5c5 (diff) | |
| parent | 33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
| -rw-r--r-- | indra/llcommon/llfasttimer.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h index 2024d707da..d463fc9d65 100644 --- a/indra/llcommon/llfasttimer.h +++ b/indra/llcommon/llfasttimer.h @@ -199,14 +199,10 @@ private: friend BlockTimer timeThisBlock(BlockTimerStatHandle&); BlockTimer(BlockTimerStatHandle& timer); -#if !defined(MSC_VER) || MSC_VER < 1700 - // Visual Studio 2010 has a bug where capturing an object returned by value - // into a local reference requires access to the copy constructor at the call site. - // This appears to be fixed in 2012. -public: -#endif + // no-copy - BlockTimer(const BlockTimer& other) {}; + BlockTimer(const BlockTimer& other); + BlockTimer& operator=(const BlockTimer& other); private: U64 mStartTime; |