From ebadc0ce34c11b3e0130d5602b18f4ed0e638386 Mon Sep 17 00:00:00 2001 From: Daniel Gollub Date: Wed, 12 Feb 2014 08:24:57 -0700 Subject: [PATCH] Make parse.h C++ safe by avoiding "or" keyword MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Updated by me to apply to recent version, and fix gfio usage of ->or as well. Signed-off-by: Jens Axboe --- goptions.c | 2 +- options.c | 6 +++--- parse.c | 2 +- parse.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/goptions.c b/goptions.c index 21d64277..5b5c89ea 100644 --- a/goptions.c +++ b/goptions.c @@ -1216,7 +1216,7 @@ static void gopt_handle_str_multi_changed(struct gopt_job_view *gjv, 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 9f6bc8d5..4dcefba0 100644 --- a/options.c +++ b/options.c @@ -1914,18 +1914,18 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { { .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 6121dfcd..e46fc14e 100644 --- a/parse.c +++ b/parse.c @@ -415,7 +415,7 @@ static int __handle_option(struct fio_option *o, const char *ptr, void *data, 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 8eefff90..5273d23f 100644 --- a/parse.h +++ b/parse.h @@ -28,7 +28,7 @@ struct value_pair { 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 */ }; -- 2.25.1