1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00

Fix -Wunreachable-code-break and add it to deafult warnings (#7634)

This commit is contained in:
Michał Janiszewski
2018-06-06 22:30:21 +02:00
committed by GitHub
parent cee74a06e1
commit 320eee0d59
5 changed files with 2 additions and 5 deletions

View File

@@ -93,7 +93,8 @@ else ()
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DUPLICATED_BRANCHES -Wduplicated-branches)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_RESTRICT -Wrestrict)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_MISSING_FIELD_INITIALIZERS -Wmissing-field-initializers)
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_UNREACHABLE_CODE_BREAK -Wunreachable-code-break)
# Items below are not supported by ICC
if (NOT MINGW)
# Do not enable for MinGW, as its headers contain redundant declarations of builtin functions

View File

@@ -132,7 +132,6 @@ namespace OpenRCT2::Audio
default:
log_verbose("Invalid bits per sample");
return false;
break;
}
_format.channels = waveFormat.channels;

View File

@@ -98,7 +98,6 @@ namespace Guard
switch (_assertBehaviour) {
case ASSERT_BEHAVIOUR::ABORT:
abort();
break;
default:
case ASSERT_BEHAVIOUR::CASSERT:
assert(false);

View File

@@ -1396,7 +1396,6 @@ bool Network::ProcessConnection(NetworkConnection& connection)
connection.SetLastDisconnectReason(STR_MULTIPLAYER_CONNECTION_CLOSED);
}
return false;
break;
case NETWORK_READPACKET_SUCCESS:
// done reading in packet
ProcessPacket(connection, connection.InboundPacket);

View File

@@ -1158,7 +1158,6 @@ track_design_place_scenery(rct_td6_scenery_element * scenery_start, sint32 origi
default:
_trackDesignPlaceStateSceneryUnavailable = true;
continue;
break;
}
_trackDesignPlaceCost = add_clamp_money32(_trackDesignPlaceCost, cost);
if (_trackDesignPlaceOperation != PTD_OPERATION_2)