1From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001
2From: Boris Kolpackov <boris@codesynthesis.com>
3Date: Wed, 7 Jul 2021 09:26:57 +0200
4Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11
5
6[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533]
7Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
8---
9 odb/relational/header.hxx | 2 ++
10 odb/relational/source.hxx | 8 ++++++++
11 2 files changed, 10 insertions(+)
12
13diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx
14index 63dea09..d7f78fa 100644
15--- a/odb/relational/header.hxx
16+++ b/odb/relational/header.hxx
17@@ -50,6 +50,8 @@ namespace relational
18
19       typedef typename member_base_impl<T>::member_info member_info;
20
21+      using member_base_impl<T>::container;
22+
23       virtual bool
24       pre (member_info& mi)
25       {
26diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx
27index 716aa10..7da25fc 100644
28--- a/odb/relational/source.hxx
29+++ b/odb/relational/source.hxx
30@@ -1360,6 +1360,8 @@ namespace relational
31
32       typedef typename member_base_impl<T>::member_info member_info;
33
34+      using member_base_impl<T>::container;
35+
36       virtual bool
37       pre (member_info& mi)
38       {
39@@ -1744,6 +1746,8 @@ namespace relational
40
41       typedef typename member_base_impl<T>::member_info member_info;
42
43+      using member_base_impl<T>::container;
44+
45       virtual bool
46       pre (member_info& mi)
47       {
48@@ -2007,6 +2011,8 @@ namespace relational
49
50       typedef typename member_base_impl<T>::member_info member_info;
51
52+      using member_base_impl<T>::container;
53+
54       virtual void
55       set_null (member_info&) = 0;
56
57@@ -2458,6 +2464,8 @@ namespace relational
58
59       typedef typename member_base_impl<T>::member_info member_info;
60
61+      using member_base_impl<T>::container;
62+
63       virtual void
64       get_null (string const& var) const = 0;
65
66--
672.34.1
68
69