Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 04:28:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix clang-tidy bugprone-macro-parentheses warnings

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-04-16 13:25:26 -07:00
parent 1d315a3847
commit 9e83759e83
9 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Type.cc
View file

@ -2155,10 +2155,6 @@ bool is_assignable(TypeTag t) {
return false;
}
#define CHECK_TYPE(t) \
if ( t1 == t || t2 == t ) \
return t;
TypeTag max_type(TypeTag t1, TypeTag t2) {
if ( t1 == TYPE_INTERVAL || t1 == TYPE_TIME )
t1 = TYPE_DOUBLE;
@ -2166,9 +2162,12 @@ TypeTag max_type(TypeTag t1, TypeTag t2) {
t2 = TYPE_DOUBLE;
if ( BothArithmetic(t1, t2) ) {
CHECK_TYPE(TYPE_DOUBLE);
CHECK_TYPE(TYPE_INT);
CHECK_TYPE(TYPE_COUNT);
if ( t1 == TYPE_DOUBLE || t2 == TYPE_DOUBLE )
return TYPE_DOUBLE;
else if ( t1 == TYPE_INT || t2 == TYPE_INT )
return TYPE_INT;
else if ( t1 == TYPE_COUNT || t2 == TYPE_COUNT )
return TYPE_COUNT;
return TYPE_COUNT;
}