summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2019-02-11 19:10:40 +0100
committerRenato Westphal <renato@opensourcerouting.org>2019-02-12 01:34:12 +0100
commit7f04943d6b860f5e74a8fc652a106c3a2046a0ce (patch)
treedba085741a8b01b0781c70f07d6db544a267ad82
parentlib: add macro that performs explicit static casts when using a C++ compiler (diff)
downloadfrr-7f04943d6b860f5e74a8fc652a106c3a2046a0ce.tar.xz
frr-7f04943d6b860f5e74a8fc652a106c3a2046a0ce.zip
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>
-rw-r--r--lib/command_graph.h2
-rw-r--r--lib/module.h7
-rw-r--r--lib/pw.h3
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/command_graph.h b/lib/command_graph.h
index cfacad43e..903d51583 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.
diff --git a/lib/module.h b/lib/module.h
index 73ba8665e..c5f96db85 100644
--- a/lib/module.h
+++ b/lib/module.h
@@ -82,9 +82,10 @@ extern union _frrmod_runtime_u _frrmod_this_module;
#define FRR_COREMOD_SETUP(...) \
static const struct frrmod_info _frrmod_info = {__VA_ARGS__}; \
- DSO_LOCAL union _frrmod_runtime_u _frrmod_this_module = { \
- .r.info = &_frrmod_info, \
- };
+ DSO_LOCAL union _frrmod_runtime_u _frrmod_this_module = {{ \
+ NULL, \
+ &_frrmod_info, \
+ }};
#define FRR_MODULE_SETUP(...) \
FRR_COREMOD_SETUP(__VA_ARGS__) \
DSO_SELF struct frrmod_runtime *frr_module = &_frrmod_this_module.r;
diff --git a/lib/pw.h b/lib/pw.h
index 0b923ed6b..42b3ee215 100644
--- a/lib/pw.h
+++ b/lib/pw.h
@@ -48,9 +48,6 @@ union pw_protocol_fields {
uint32_t pwid;
char vpn_name[L2VPN_NAME_LEN];
} ldp;
- struct {
- /* TODO */
- } bgp;
};
#ifdef __cplusplus