osmith submitted this change.

View Change

VTY: Initialize fields of struct cmd_element in order of declaration

gpp requires designated initialisers to be initialized in the order
their fields were declared. With this patch it is possible to include
VTY's command.h within C++ code.

Change-Id: Ifaa31980f149f9c1f1a9b28f318a4850f6855472
(cherry picked from commit c59d99352c1903adcc84fbd54c2a60c410a6ad31)
---
M include/osmocom/vty/command.h
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h
index 61b5881..667e9ab 100644
--- a/include/osmocom/vty/command.h
+++ b/include/osmocom/vty/command.h
@@ -218,8 +218,8 @@
     .string = cmdstr, \
     .func = funcname, \
     .doc = helpstr, \
-    .attr = attrs, \
     .daemon = dnum, \
+    .attr = attrs, \
   };
 
 /* global (non static) cmd_element */
@@ -229,8 +229,8 @@
     .string = cmdstr, \
     .func = funcname, \
     .doc = helpstr, \
-    .attr = attrs, \
     .daemon = dnum, \
+    .attr = attrs, \
   };
 
 #define DEFUN_CMD_ELEMENT_ATTR_USRATTR(funcname, cmdname, cmdstr, helpstr, attrs, usrattrs) \

To view, visit change 40920. To unsubscribe, or for help writing mail filters, visit settings.