diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-09-06 11:07:39 -0400 |
| commit | 5edd4cecfc53b8287e1b3c6a22142bc72b8e0356 (patch) | |
| tree | b5bed4e1e4279b88ae882d93264dc2234ecb81e8 /indra/llrender | |
| parent | 8c86c594be7b7898ac6e622c505181cf5b000da6 (diff) | |
| parent | 1804da89eea38615a4dd9532757b7ef7c35d2be6 (diff) | |
merge changes for exception handling
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index ebed454271..01c1d81823 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -240,6 +240,15 @@ 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) @@ -250,6 +259,11 @@ 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) { |