From 868947cbb4e09c03b79b6076d023e9e6c07fa0bd Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 23 Mar 2021 23:49:08 +0300 Subject: [PATCH] engine: try to avoid broken -Werror=duplicated-branches for old GCCs --- engine/common/net_encode.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engine/common/net_encode.c b/engine/common/net_encode.c index 8570702f..377365a4 100644 --- a/engine/common/net_encode.c +++ b/engine/common/net_encode.c @@ -989,7 +989,6 @@ qboolean Delta_CompareField( delta_t *pField, void *from, void *to, float timeba #if defined __GNUC__ && __GNUC_MAJOR < 9 && !defined __clang__ #pragma GCC diagnostic pop #endif - fromF = Delta_ClampIntegerField( pField, fromF, bSigned, pField->bits ); toF = Delta_ClampIntegerField( pField, toF, bSigned, pField->bits ); if( pField->multiplier != 1.0f ) fromF *= pField->multiplier; @@ -1254,6 +1253,10 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to, } else if( pField->flags & DT_INTEGER ) { +#if defined __GNUC__ && __GNUC_MAJOR < 9 && !defined __clang__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wduplicated-branches" +#endif if( bChanged ) { iValue = MSG_ReadBitLong( msg, pField->bits, bSigned ); @@ -1270,6 +1273,9 @@ qboolean Delta_ReadField( sizebuf_t *msg, delta_t *pField, void *from, void *to, *(int32_t *)((uint8_t *)to + pField->offset ) = iValue; else *(uint32_t *)((uint8_t *)to + pField->offset ) = iValue; +#if defined __GNUC__ && __GNUC_MAJOR < 9 && !defined __clang__ +#pragma GCC diagnostic pop +#endif } else if( pField->flags & DT_FLOAT ) {