diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:49:49 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-02-23 16:49:49 -0500 |
commit | ae0b3149badf369eb2b1f10aba830eef8b4af9b4 (patch) | |
tree | 8ce8316e88f684a40879fa43cea3f37f7f16aaac /indra/llimage | |
parent | 80a878a79289ba2245ad35e5ae67a0034d0271e3 (diff) |
DRTVWR-418: Fix a round of compile errors surfaced by -std=c++11.
These are mostly things that were in fact erroneous, but accepted by older
compilers.
This changeset has not yet been built with Visual Studio 2013 or Linux gcc,
even with -std=c++11.
This changeset has not been built *without* -std=c++11. It should be used in
conjunction with a corresponding change to LL_BUILD_DARWIN_BASE_SWITCHES in
viewer-build-variables/variables.
This is a work in progress. We do not assert that this changeset completes the
work needed to turn on -std=c++11, even on the Mac.
Diffstat (limited to 'indra/llimage')
-rw-r--r-- | indra/llimage/llimagetga.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp index 5ad7658ec1..7c75aa1e2a 100644 --- a/indra/llimage/llimagetga.cpp +++ b/indra/llimage/llimagetga.cpp @@ -811,7 +811,7 @@ bool LLImageTGA::decodeTruecolorRle32( LLImageRaw* raw_image, bool &alpha_opaque } src += 4; - register U32 value = rgba; + U32 value = rgba; do { *dst_pixels = value; |