Skip to content

Use C++17 [[fallthrough]] to make intentional fallthroughs explicit #405

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
akien-mga wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −28
Open

Use C++17 [[fallthrough]] to make intentional fallthroughs explicit #405

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
34 changes: 6 additions & 28 deletions encoder/3rdparty/android_astc_decomp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,28 +836,17 @@ void decodeISETritBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
m[4] = data.getNext(numBits);
deUint32 T7 = data.getNext(1);

#ifndef __EMSCRIPTEN__
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
#endif
#endif
switch (numValues)
{
// \note Fall-throughs.
case 1: T23 = 0;
case 2: T4 = 0;
case 3: T56 = 0;
case 4: T7 = 0;
case 1: T23 = 0; [[fallthrough]];
case 2: T4 = 0; [[fallthrough]];
case 3: T56 = 0; [[fallthrough]];
case 4: T7 = 0; [[fallthrough]];
case 5: break;
default:
DE_ASSERT(false);
}
#ifndef __EMSCRIPTEN__
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif

const deUint32 T = (T7 << 7) | (T56 << 5) | (T4 << 4) | (T23 << 2) | (T01 << 0);

Expand Down Expand Up @@ -902,26 +891,15 @@ void decodeISEQuintBlock (ISEDecodedResult* dst, int numValues, BitAccessStream&
m[2] = data.getNext(numBits);
deUint32 Q56 = data.getNext(2);

#ifndef __EMSCRIPTEN__
#ifdef __GNUC__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough="
#endif
#endif
switch (numValues)
{
// \note Fall-throughs.
case 1: Q34 = 0;
case 2: Q56 = 0;
case 1: Q34 = 0; [[fallthrough]];
case 2: Q56 = 0; [[fallthrough]];
case 3: break;
default:
DE_ASSERT(false);
}
#ifndef __EMSCRIPTEN__
#ifdef __GNUC__
#pragma GCC diagnostic pop
#endif
#endif

const deUint32 Q = (Q56 << 5) | (Q34 << 3) | (Q012 << 0);

Expand Down