Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / external / fio / ebadc0ce34c11b3e0130d5602b18f4ed0e638386
commitebadc0ce34c11b3e0130d5602b18f4ed0e638386[log] [tgz]
authorDaniel Gollub <daniel.gollub@t-online.de>Wed Feb 12 08:24:57 2014 -0700
committerJens Axboe <axboe@fb.com>Wed Feb 12 08:24:57 2014 -0700
tree7a0a3afcfde6f5b4713d470d21e63b3bafbb3685
parentbea5c23dfb5166931ff476a483fd66d5e5b10601 [diff]
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>
4 files changed
tree: 7a0a3afcfde6f5b4713d470d21e63b3bafbb3685
  1. arch/
  2. compiler/
  3. crc/
  4. engines/
  5. examples/
  6. lib/
  7. os/
  8. profiles/
  9. t/
  10. tools/
  11. .gitignore
  12. backend.c
  13. blktrace.c
  14. blktrace_api.h
  15. cairo_text_helpers.c
  16. cairo_text_helpers.h
  17. cconv.c
  18. cgroup.c
  19. cgroup.h
  20. client.c
  21. client.h
  22. configure
  23. COPYING
  24. debug.c
  25. debug.h
  26. diskutil.c
  27. diskutil.h
  28. err.h
  29. eta.c
  30. fifo.c
  31. fifo.h
  32. file.h
  33. filehash.c
  34. filehash.h
  35. filesetup.c
  36. FIO-VERSION-GEN
  37. fio.1
  38. fio.c
  39. fio.h
  40. flist.h
  41. flow.c
  42. flow.h
  43. gclient.c
  44. gclient.h
  45. gcompat.c
  46. gcompat.h
  47. gerror.c
  48. gerror.h
  49. gettime-thread.c
  50. gettime.c
  51. gettime.h
  52. GFIO-TODO
  53. gfio.c
  54. gfio.h
  55. ghelpers.c
  56. ghelpers.h
  57. goptions.c
  58. goptions.h
  59. graph.c
  60. graph.h
  61. hash.h
  62. helpers.c
  63. helpers.h
  64. HOWTO
  65. idletime.c
  66. idletime.h
  67. init.c
  68. io_ddir.h
  69. io_u.c
  70. io_u_queue.c
  71. io_u_queue.h
  72. ioengine.h
  73. ioengines.c
  74. iolog.c
  75. iolog.h
  76. json.c
  77. json.h
  78. libfio.c
  79. LICENSE
  80. log.c
  81. log.h
  82. Makefile
  83. memalign.c
  84. memalign.h
  85. memory.c
  86. minmax.h
  87. mutex.c
  88. mutex.h
  89. options.c
  90. options.h
  91. parse.c
  92. parse.h
  93. printing.c
  94. printing.h
  95. profile.c
  96. profile.h
  97. README
  98. REPORTING-BUGS
  99. SERVER-TODO
  100. server.c
  101. server.h
  102. smalloc.c
  103. smalloc.h
  104. stat.c
  105. stat.h
  106. td_error.c
  107. td_error.h
  108. thread_options.h
  109. tickmarks.c
  110. tickmarks.h
  111. time.c
  112. time.h
  113. trim.c
  114. trim.h
  115. verify.c
  116. verify.h