livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset c30d8774c404: remove warning suppression 

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

NickyD suggested a real fix.
master
Nat Goodspeed 2016-09-06 20:41:23 -04:00
parent 20cf275d21
commit bfb400ccd7
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llrender/llimagegl.cpp
View File

@ -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)
{