summaryrefslogtreecommitdiffstats
path: root/zebra/rib.h
diff options
context:
space:
mode:
authorEmanuele Di Pascale <emanuele@voltanet.io>2020-12-21 13:17:09 +0100
committerEmanuele Di Pascale <emanuele@voltanet.io>2020-12-21 14:34:55 +0100
commit2e8db20d7eefbbc45aa64c8f5d61be276184a69c (patch)
treeffeee52ad1925bea404f39787758c041f86fb3d6 /zebra/rib.h
parentMerge pull request #7773 from GalaxyGorilla/clippy_clappy (diff)
downloadfrr-2e8db20d7eefbbc45aa64c8f5d61be276184a69c.tar.xz
frr-2e8db20d7eefbbc45aa64c8f5d61be276184a69c.zip
zebra: avoid c++ reserved keyword
in rib_handle_nhg_replace, do not use new as a parameter name to allow compilation of c++ code including zebra headers. Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
Diffstat (limited to 'zebra/rib.h')
-rw-r--r--zebra/rib.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/zebra/rib.h b/zebra/rib.h
index fe7073656..680c400f0 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -343,8 +343,8 @@ int route_entry_update_nhe(struct route_entry *re,
struct nhg_hash_entry *new_nhghe);
/* NHG replace has happend, we have to update route_entry pointers to new one */
-void rib_handle_nhg_replace(struct nhg_hash_entry *old,
- struct nhg_hash_entry *new);
+void rib_handle_nhg_replace(struct nhg_hash_entry *old_entry,
+ struct nhg_hash_entry *new_entry);
#define route_entry_dump(prefix, src, re) _route_entry_dump(__func__, prefix, src, re)
extern void _route_entry_dump(const char *func, union prefixconstptr pp,