From 356630ced28f3101e8e2d88e3c52f8d3008515c7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 7 Nov 2017 14:58:43 +0200
Subject: Adapt to changes in GCC 8

---
 odb/semantics/elements.cxx | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'odb/semantics/elements.cxx')

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
-- 
cgit v1.1