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/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;
}
}