Skip to content

Commit 4b0243f

Browse files
authored
fix(bitflags): Use UnsignedInt64 and %I64X to support VC6 compiler in BitFlags.h (#2759)
1 parent a48935d commit 4b0243f

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

  • GeneralsMD/Code/GameEngine/Include/Common
  • Generals/Code/GameEngine/Include/Common

Generals/Code/GameEngine/Include/Common/BitFlags.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,19 +309,19 @@ class BitFlags
309309

310310
for (int chunk = numChunks - 1; chunk >= 0; --chunk)
311311
{
312-
unsigned long long val = 0;
312+
UnsignedInt64 val = 0;
313313
for (int bit = 0; bit < 64 && (chunk * 64 + bit) < NUMBITS; ++bit)
314314
{
315315
if (m_bits.test(chunk * 64 + bit))
316-
val |= (unsigned long long)(1) << bit;
316+
val |= (UnsignedInt64)(1) << bit;
317317
}
318318

319319
if (val != 0 || chunk == 0 || printedAny)
320320
{
321321
if (printedAny)
322-
snprintf(chunkBuf, sizeof(chunkBuf), "%016llX", val);
322+
snprintf(chunkBuf, sizeof(chunkBuf), "%016I64X", val);
323323
else
324-
snprintf(chunkBuf, sizeof(chunkBuf), "%llX", val);
324+
snprintf(chunkBuf, sizeof(chunkBuf), "%I64X", val);
325325

326326
result.concat(chunkBuf);
327327
printedAny = true;

GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,19 +309,19 @@ class BitFlags
309309

310310
for (int chunk = numChunks - 1; chunk >= 0; --chunk)
311311
{
312-
unsigned long long val = 0;
312+
UnsignedInt64 val = 0;
313313
for (int bit = 0; bit < 64 && (chunk * 64 + bit) < NUMBITS; ++bit)
314314
{
315315
if (m_bits.test(chunk * 64 + bit))
316-
val |= (unsigned long long)(1) << bit;
316+
val |= (UnsignedInt64)(1) << bit;
317317
}
318318

319319
if (val != 0 || chunk == 0 || printedAny)
320320
{
321321
if (printedAny)
322-
snprintf(chunkBuf, sizeof(chunkBuf), "%016llX", val);
322+
snprintf(chunkBuf, sizeof(chunkBuf), "%016I64X", val);
323323
else
324-
snprintf(chunkBuf, sizeof(chunkBuf), "%llX", val);
324+
snprintf(chunkBuf, sizeof(chunkBuf), "%I64X", val);
325325

326326
result.concat(chunkBuf);
327327
printedAny = true;

0 commit comments

Comments
 (0)