aboutsummaryrefslogtreecommitdiff
path: root/odb/cxx-lexer.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-02-05 16:01:42 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-02-05 16:01:42 +0200
commit511dcf67322ad87fb32f97d1cf7725c129e83898 (patch)
treecfcbf8705fc208d101b8adbd270a425e7466d518 /odb/cxx-lexer.cxx
parentd1b34452618d36eb486ff18b16f5d94acc6eeb07 (diff)
Initial work to make ODB compatible with GCC 6
Diffstat (limited to 'odb/cxx-lexer.cxx')
-rw-r--r--odb/cxx-lexer.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx
index 7029c7e..64df296 100644
--- a/odb/cxx-lexer.cxx
+++ b/odb/cxx-lexer.cxx
@@ -135,8 +135,12 @@ cpp_error_callback (
#if BUILDING_GCC_MAJOR > 4 || BUILDING_GCC_MAJOR == 4 && BUILDING_GCC_MINOR > 5
int /*reason*/, // Added in GCC 4.6.0.
#endif
+#if BUILDING_GCC_MAJOR <= 5
location_t,
unsigned int,
+#else
+ rich_location*,
+#endif
char const* msg,
va_list *ap)
{