Skip to content
Snippets Groups Projects
Commit bfb400cc authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

Backed out changeset c30d8774c404: remove warning suppression

for possibly-uninitialized data member in BlockTimer::BlockTimer.

NickyD suggested a real fix.
parent 20cf275d
No related branches found
No related tags found
No related merge requests found
...@@ -240,15 +240,6 @@ S32 LLImageGL::dataFormatComponents(S32 dataformat) ...@@ -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 LLTrace::BlockTimerStatHandle FTM_IMAGE_UPDATE_STATS("Image Stats");
// static // static
void LLImageGL::updateStats(F32 current_time) void LLImageGL::updateStats(F32 current_time)
...@@ -259,11 +250,6 @@ void LLImageGL::updateStats(F32 current_time) ...@@ -259,11 +250,6 @@ void LLImageGL::updateStats(F32 current_time)
sCurBoundTextureMemory = S32Bytes(0); sCurBoundTextureMemory = S32Bytes(0);
} }
#if LL_LINUX
// In general we do want to know about uninitialized variables!
#pragma GCC diagnostic pop
#endif
//static //static
S32 LLImageGL::updateBoundTexMem(const S32Bytes mem, const S32 ncomponents, S32 category) S32 LLImageGL::updateBoundTexMem(const S32Bytes mem, const S32 ncomponents, S32 category)
{ {
......
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