diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-07 14:58:43 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-07 14:58:43 +0200 |
| commit | 356630ced28f3101e8e2d88e3c52f8d3008515c7 (patch) | |
| tree | 6950cfd3797bbe34e375c223e4226666fef69202 /odb/validator.cxx | |
| parent | bc1616e3e45967ccec892d14a9337554238ca332 (diff) | |
Adapt to changes in GCC 8
Diffstat (limited to 'odb/validator.cxx')
| -rw-r--r-- | odb/validator.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/odb/validator.cxx b/odb/validator.cxx index cd22548..75757cd 100644 --- a/odb/validator.cxx +++ b/odb/validator.cxx @@ -560,9 +560,17 @@ namespace // Figure out if we have a const version of the callback. OVL_* // macros work for both FUNCTION_DECL and OVERLOAD. // +#if BUILDING_GCC_MAJOR >= 8 + for (ovl_iterator i (BASELINK_FUNCTIONS (decl)); i; ++i) +#else for (tree o (BASELINK_FUNCTIONS (decl)); o != 0; o = OVL_NEXT (o)) +#endif { +#if BUILDING_GCC_MAJOR >= 8 + tree f (*i); +#else tree f (OVL_CURRENT (o)); +#endif if (DECL_CONST_MEMFUNC_P (f)) { c.set ("callback-const", true); @@ -1504,7 +1512,7 @@ namespace compiler, get_identifier ("has_lt_operator"), false, false); if (has_lt_operator_ != error_mark_node) - has_lt_operator_ = OVL_CURRENT (has_lt_operator_); + has_lt_operator_ = OVL_FIRST (has_lt_operator_); else { os << unit.file () << ": error: unable to resolve has_lt_operator " |