From 902bfccd0239b33e28c8c1c45e14d4463bd56701 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Tue, 28 May 2019 19:16:34 +0300 Subject: SL-11231 Unused code and wrong macro --- indra/llcommon/llfasttimer.h | 10 +++------- 1 file 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; -- cgit v1.2.3