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/semantics | |
| parent | bc1616e3e45967ccec892d14a9337554238ca332 (diff) | |
Adapt to changes in GCC 8
Diffstat (limited to 'odb/semantics')
| -rw-r--r-- | odb/semantics/elements.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx index a907dd5..b2df56f 100644 --- a/odb/semantics/elements.cxx +++ b/odb/semantics/elements.cxx @@ -143,7 +143,11 @@ namespace semantics { tree prev (CP_DECL_CONTEXT (s)); +#if BUILDING_GCC_MAJOR >= 8 + if (!is_nested_namespace (prev, s, true)) +#else if (!is_associated_namespace (prev, s)) +#endif break; s = prev; @@ -240,7 +244,11 @@ namespace semantics { // Check if this is an inline namespace and skip it if so. // +#if BUILDING_GCC_MAJOR >= 8 + if (is_nested_namespace (ns, new_ns, true)) +#else if (is_associated_namespace (ns, new_ns)) +#endif { // Skip also the following scope operator. Strictly speaking // there could be none (i.e., this is a name of an inline |