diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-06 20:41:23 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-06 20:41:23 -0400 |
| commit | bfb400ccd7fbf6718751aaab65c68c9a84aa7585 (patch) | |
| tree | 5df935129546a58a21a9daa4d9e82a00269cc412 | |
| parent | 20cf275d21c0dce569bb3a16393b529c5c9f1c6c (diff) | |
Backed out changeset c30d8774c404: remove warning suppression
for possibly-uninitialized data member in BlockTimer::BlockTimer.
NickyD suggested a real fix.
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index 01c1d81823..ebed454271 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -240,15 +240,6 @@ S32 LLImageGL::dataFormatComponents(S32 dataformat) //---------------------------------------------------------------------------- -#if LL_LINUX -// gcc 4.7.2 produces this error for the following function, which nat has -// been unable to diagnose as an actual problem: -// llimagegl.cpp:247:2: error: '<anonymous>.LLTrace::BlockTimer::mStartTime' -// may be used uninitialized in this function [-Werror=uninitialized] -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wuninitialized" -#endif - static LLTrace::BlockTimerStatHandle FTM_IMAGE_UPDATE_STATS("Image Stats"); // static void LLImageGL::updateStats(F32 current_time) @@ -259,11 +250,6 @@ void LLImageGL::updateStats(F32 current_time) sCurBoundTextureMemory = S32Bytes(0); } -#if LL_LINUX -// In general we do want to know about uninitialized variables! -#pragma GCC diagnostic pop -#endif - //static S32 LLImageGL::updateBoundTexMem(const S32Bytes mem, const S32 ncomponents, S32 category) { |