AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-08 21:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

General: Eliminate instances of shadowing

Browse Source 
Avoids instances of local variable shadowing (which also silences some
-Wshadow warnings).
This commit is contained in:
Lioncash
2019-08-25 00:15:45 -04:00
parent 529efa72b4
commit 051e4b1704
4 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/SongState.cpp
View File

@@ -253,14 +253,14 @@ int SongState::DetectVersion(const unsigned char* ptr, bool& isBig) {
const unsigned char* expectedEnd =
ptr + (isBig ? SBig(regionIdxTable[regionIdx + 1]) : regionIdxTable[regionIdx + 1]);
Track::Header header = *reinterpret_cast<const Track::Header*>(data);
auto header2 = *reinterpret_cast<const Track::Header*>(data);
if (isBig)
header.swapBig();
header2.swapBig();
data += 12;
/* continuous pitch data */
if (header.m_pitchOff) {
const unsigned char* dptr = ptr + header.m_pitchOff;
if (header2.m_pitchOff) {
const unsigned char* dptr = ptr + header2.m_pitchOff;
while (dptr[0] != 0x80 || dptr[1] != 0x00)
DecodeDelta(dptr);
dptr += 2;
@@ -269,8 +269,8 @@ int SongState::DetectVersion(const unsigned char* ptr, bool& isBig) {
}
/* continuous modulation data */
if (header.m_modOff) {
const unsigned char* dptr = ptr + header.m_modOff;
if (header2.m_modOff) {
const unsigned char* dptr = ptr + header2.m_modOff;
while (dptr[0] != 0x80 || dptr[1] != 0x00)
DecodeDelta(dptr);
dptr += 2;