summaryrefslogtreecommitdiff
path: root/lib/command_graph.h
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2019-02-11 16:10:40 -0200
committerRenato Westphal <renato@opensourcerouting.org>2019-02-11 22:34:12 -0200
commit7f04943d6b860f5e74a8fc652a106c3a2046a0ce (patch)
treedba085741a8b01b0781c70f07d6db544a267ad82 /lib/command_graph.h
parent343cd13e17062eb024f45b44036d930988bd0299 (diff)
lib: a few more trivial changes for C++ compatibility
* command_graph.h: stop using "new" as a parameter name as that's a reserved C++ keyword. * module.h: avoid using C99 designated initializers since C++ doesn't support them. This change hurts code readability quite considerably, so we should try to find a better solution later. * pw.h: remove unneeded empty structure to silence a C++ warning. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'lib/command_graph.h')
-rw-r--r--lib/command_graph.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/command_graph.h b/lib/command_graph.h
index cfacad43e2..903d515834 100644
--- a/lib/command_graph.h
+++ b/lib/command_graph.h
@@ -118,7 +118,7 @@ extern void cmd_token_varname_set(struct cmd_token *token, const char *varname);
extern void cmd_graph_parse(struct graph *graph, struct cmd_element *cmd);
extern void cmd_graph_names(struct graph *graph);
-extern void cmd_graph_merge(struct graph *old, struct graph *new,
+extern void cmd_graph_merge(struct graph *old, struct graph *n,
int direction);
/*
* Print callback for DOT dumping.