michaelh/zephyr
1
0
Fork 0
Code Releases Activity

toolchain: gcc: rename popcount to avoid conflict with C++20

Browse source 
The macro conflicts with the C++20 feature std::popcount

fixes zephyrproject-rtos/zephyr#53421

Signed-off-by: Hein Wessels <heinwessels93@gmail.com>
This commit is contained in:
Hein Wessels 2023-01-03 08:29:50 +01:00 • committed by Carles Cufí
commit 3210541c86
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
subsys/bluetooth/mesh/lpn.c
View file

@ -748,10 +748,10 @@ static inline int group_popcount(atomic_t *target)
int i, count = 0;
for (i = 0; i < ARRAY_SIZE(bt_mesh.lpn.added); i++) {
count += popcount(atomic_get(&target[i]));
count += POPCOUNT(atomic_get(&target[i]));
}
#else
return popcount(atomic_get(target));
return POPCOUNT(atomic_get(target));
#endif
}

2
subsys/bluetooth/mesh/transport.c
View file

@ -1002,7 +1002,7 @@ static inline int32_t ack_timeout(struct seg_rx *rx)
(ttl * (int32_t)CONFIG_BT_MESH_SEG_ACK_PER_HOP_TIMEOUT);
/* Add timeout for evenry not yet received segment. */
to += ((rx->seg_n + 1) - popcount(rx->block)) *
to += ((rx->seg_n + 1) - POPCOUNT(rx->block)) *
(int32_t)CONFIG_BT_MESH_SEG_ACK_PER_SEGMENT_TIMEOUT;
/* Make sure we don't send more frequently than the duration for