From 47035c0f72efd99a2210cd45db6e42423fb74533 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 7 Jul 2021 09:26:57 +0200
Subject: Resolve name lookup ambiguity causing error with GCC 11

---
 odb/relational/header.hxx | 2 ++
 odb/relational/source.hxx | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx
index 30a61ea..964aff2 100644
--- a/odb/relational/header.hxx
+++ b/odb/relational/header.hxx
@@ -47,6 +47,8 @@ namespace relational
 
       typedef typename member_base_impl<T>::member_info member_info;
 
+      using member_base_impl<T>::container;
+
       virtual bool
       pre (member_info& mi)
       {
diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx
index f82b5ad..a24ddef 100644
--- a/odb/relational/source.hxx
+++ b/odb/relational/source.hxx
@@ -1370,6 +1370,8 @@ namespace relational
 
       typedef typename member_base_impl<T>::member_info member_info;
 
+      using member_base_impl<T>::container;
+
       virtual bool
       pre (member_info& mi)
       {
@@ -1751,6 +1753,8 @@ namespace relational
 
       typedef typename member_base_impl<T>::member_info member_info;
 
+      using member_base_impl<T>::container;
+
       virtual bool
       pre (member_info& mi)
       {
@@ -2025,6 +2029,8 @@ namespace relational
 
       typedef typename member_base_impl<T>::member_info member_info;
 
+      using member_base_impl<T>::container;
+
       virtual void
       set_null (member_info&) = 0;
 
@@ -2496,6 +2502,8 @@ namespace relational
 
       typedef typename member_base_impl<T>::member_info member_info;
 
+      using member_base_impl<T>::container;
+
       virtual void
       get_null (string const& var) const = 0;
 
-- 
cgit v1.1