Make parse.h C++ safe by avoiding "or" keyword
Fixes for g++ (4.7.2) following compiler errors when fio.h
gets included (e.g. in an external C++ ioengine):
--8<---
[...]
parse.h:31:6: error: expected unqualified-id before ‘or’ token
[...]
--->8---
Signed-off-by: Daniel Gollub <d.gollub@telekom.de>
Updated by me to apply to recent version, and fix gfio usage
of ->or as well.
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/goptions.c b/goptions.c
index 21d6427..5b5c89e 100644
--- a/goptions.c
+++ b/goptions.c
@@ -1216,7 +1216,7 @@
break;
set = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(m->checks[i]));
if (set) {
- if (vp->or)
+ if (vp->orval)
val |= vp->oval;
else
val = vp->oval;
diff --git a/options.c b/options.c
index 9f6bc8d..4dcefba 100644
--- a/options.c
+++ b/options.c
@@ -1914,18 +1914,18 @@
{ .ival = "wait_before",
.oval = SYNC_FILE_RANGE_WAIT_BEFORE,
.help = "SYNC_FILE_RANGE_WAIT_BEFORE",
- .or = 1,
+ .orval = 1,
},
{ .ival = "write",
.oval = SYNC_FILE_RANGE_WRITE,
.help = "SYNC_FILE_RANGE_WRITE",
- .or = 1,
+ .orval = 1,
},
{
.ival = "wait_after",
.oval = SYNC_FILE_RANGE_WAIT_AFTER,
.help = "SYNC_FILE_RANGE_WAIT_AFTER",
- .or = 1,
+ .orval = 1,
},
},
.type = FIO_OPT_STR_MULTI,
diff --git a/parse.c b/parse.c
index 6121dfc..e46fc14 100644
--- a/parse.c
+++ b/parse.c
@@ -415,7 +415,7 @@
if (!strncmp(vp->ival, ptr, str_match_len(vp, ptr))) {
ret = 0;
if (o->off1)
- val_store(ilp, vp->oval, o->off1, vp->or, data, o);
+ val_store(ilp, vp->oval, o->off1, vp->orval, data, o);
continue;
}
}
diff --git a/parse.h b/parse.h
index 8eefff9..5273d23 100644
--- a/parse.h
+++ b/parse.h
@@ -28,7 +28,7 @@
const char *ival; /* string option */
unsigned int oval; /* output value */
const char *help; /* help text for sub option */
- int or; /* OR value */
+ int orval; /* OR value */
void *cb; /* sub-option callback */
};