Skip to content

fix(bitflags): Use UnsignedInt64 and %I64X to support VC6 compiler in BitFlags.h #2759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Okladnoj wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

fix(bitflags): Use UnsignedInt64 and %I64X to support VC6 compiler in BitFlags.h #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Generals/Code/GameEngine/Include/Common/BitFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,19 @@ class BitFlags

for (int chunk = numChunks - 1; chunk >= 0; --chunk)
{
unsigned long long val = 0;
UnsignedInt64 val = 0;
for (int bit = 0; bit < 64 && (chunk * 64 + bit) < NUMBITS; ++bit)
{
if (m_bits.test(chunk * 64 + bit))
val |= (unsigned long long)(1) << bit;
val |= (UnsignedInt64)(1) << bit;
}

if (val != 0 || chunk == 0 || printedAny)
{
if (printedAny)
snprintf(chunkBuf, sizeof(chunkBuf), "%016llX", val);
snprintf(chunkBuf, sizeof(chunkBuf), "%016I64X", val);
else
snprintf(chunkBuf, sizeof(chunkBuf), "%llX", val);
snprintf(chunkBuf, sizeof(chunkBuf), "%I64X", val);
Comment thread
xezon marked this conversation as resolved.

result.concat(chunkBuf);
printedAny = true;
Expand Down
8 changes: 4 additions & 4 deletions GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,19 +309,19 @@ class BitFlags

for (int chunk = numChunks - 1; chunk >= 0; --chunk)
{
unsigned long long val = 0;
UnsignedInt64 val = 0;
for (int bit = 0; bit < 64 && (chunk * 64 + bit) < NUMBITS; ++bit)
{
if (m_bits.test(chunk * 64 + bit))
val |= (unsigned long long)(1) << bit;
val |= (UnsignedInt64)(1) << bit;
}

if (val != 0 || chunk == 0 || printedAny)
{
if (printedAny)
snprintf(chunkBuf, sizeof(chunkBuf), "%016llX", val);
snprintf(chunkBuf, sizeof(chunkBuf), "%016I64X", val);
else
snprintf(chunkBuf, sizeof(chunkBuf), "%llX", val);
snprintf(chunkBuf, sizeof(chunkBuf), "%I64X", val);

result.concat(chunkBuf);
printedAny = true;
Expand Down
Loading