diff options
| author | Mark Stapp <mjs@voltanet.io> | 2019-01-15 19:34:23 +0100 |
|---|---|---|
| committer | Renato Westphal <renato@opensourcerouting.org> | 2019-02-11 18:49:49 +0100 |
| commit | d01b92fd7507d64bec89350daf725aa6fb9fdcf4 (patch) | |
| tree | e11fcaa40c9fe08b636f8ca58b786a7766a065ed /lib/table.h | |
| parent | Merge pull request #3770 from donaldsharp/detailed_debugs (diff) | |
| download | frr-d01b92fd7507d64bec89350daf725aa6fb9fdcf4.tar.xz frr-d01b92fd7507d64bec89350daf725aa6fb9fdcf4.zip | |
libs, daemons: changes to permit c++ compilation
Some misc changes to resolve some c++ compilation errors.
The goal is only to permit an external module - a plugin,
for example - to see frr headers, not to support or encourage
contributions in c++. The changes include: avoiding use
of keywords like 'new', 'delete'; cleaning up implicit
type-casting from 'void *' in several places.
Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'lib/table.h')
| -rw-r--r-- | lib/table.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/table.h b/lib/table.h index 541d74d77..a251d2206 100644 --- a/lib/table.h +++ b/lib/table.h @@ -275,12 +275,15 @@ static inline struct route_node *route_table_iter_next(route_table_iter_t *iter) break; case RT_ITER_STATE_PAUSED: + { + union prefixconstptr cp = {.p = &iter->pause_prefix}; /* * Start with the node following pause_prefix. */ - node = route_table_get_next(iter->table, &iter->pause_prefix); - break; + node = route_table_get_next(iter->table, cp); + } + break; case RT_ITER_STATE_DONE: return NULL; |