mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-03 15:55:19 +00:00
Code Issues Releases Wiki Activity

ovsdb-idl: Avoid mutable type specifier.

Browse Source 
In C++, 'mutable' is a keyword. If this is used as the name for a field,
then C++ compilers can get confused about the context and fail to
compile references to such fields. Rename the field to 'is_mutable' to
avoid this issue.

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Joe Stringer
2017-08-11 11:06:45 -07:00
parent 3eb1423353
commit c6e5d064a4
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ovsdb-idl-provider.h
View File

@@ -89,7 +89,7 @@ struct ovsdb_idl_row {
struct ovsdb_idl_column { struct ovsdb_idl_column {
char *name; char *name;
struct ovsdb_type type; struct ovsdb_type type;
bool mutable; bool is_mutable;
void (*parse)(struct ovsdb_idl_row *, const struct ovsdb_datum *); void (*parse)(struct ovsdb_idl_row *, const struct ovsdb_datum *);
void (*unparse)(struct ovsdb_idl_row *); void (*unparse)(struct ovsdb_idl_row *);
}; };

2
lib/ovsdb-idl.c
View File

@@ -2871,7 +2871,7 @@ bool
ovsdb_idl_is_mutable(const struct ovsdb_idl_row *row, ovsdb_idl_is_mutable(const struct ovsdb_idl_row *row,
const struct ovsdb_idl_column *column) const struct ovsdb_idl_column *column)
{ {
return column->mutable || (row->new && !row->old); return column->is_mutable || (row->new && !row->old);
} }
/* Returns false if 'row' was obtained from the IDL, true if it was initialized /* Returns false if 'row' was obtained from the IDL, true if it was initialized

2
ovsdb/ovsdb-idlc.in
View File

@@ -1268,7 +1268,7 @@ void
.type = { .type = {
%(type)s %(type)s
}, },
.mutable = %(mutable)s, .is_mutable = %(mutable)s,
.parse = %(s)s_parse_%(c)s, .parse = %(s)s_parse_%(c)s,
.unparse = %(s)s_unparse_%(c)s, .unparse = %(s)s_unparse_%(c)s,
},\n""" % {'P': prefix.upper(), },\n""" % {'P': prefix.upper(),