Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
20cf275d
Commit
20cf275d
authored
8 years ago
by
Nat Goodspeed
Browse files
Options
Downloads
Patches
Plain Diff
MAINT-5011: Work around gcc 4.7.2 overly (?) picky fatal warning.
parent
0c2442eb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/llrender/llimagegl.cpp
+14
-0
14 additions, 0 deletions
indra/llrender/llimagegl.cpp
with
14 additions
and
0 deletions
indra/llrender/llimagegl.cpp
+
14
−
0
View file @
20cf275d
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment