From f7364d846344520165e0f4385f186416ef6eee6c Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Thu, 25 Oct 2018 12:25:00 +0200 Subject: [PATCH] base: avoid warnings in list.h clang: error: member 'Element' found in multiple base classes of different types Issue #3022 --- repos/base/include/util/list.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/repos/base/include/util/list.h b/repos/base/include/util/list.h index f37b2e4fd6..e93cc53288 100644 --- a/repos/base/include/util/list.h +++ b/repos/base/include/util/list.h @@ -76,11 +76,11 @@ class Genode::List { /* insert at beginning of the list */ if (at == 0) { - le->Element::_next = _first; + le->List::Element::_next = _first; _first = const_cast(le); } else { - le->Element::_next = at->Element::_next; - at->Element::_next = const_cast(le); + le->List::Element::_next = at->List::Element::_next; + at->List::Element::_next = const_cast(le); } } @@ -93,7 +93,7 @@ class Genode::List /* if specified element is the first of the list */ if (le == _first) { - _first = le->Element::_next; + _first = le->List::Element::_next; } else { @@ -106,10 +106,10 @@ class Genode::List if (!e->_next) return; /* e->_next is the element to remove, skip it in list */ - e->Element::_next = e->Element::_next->Element::_next; + e->List::Element::_next = e->List::Element::_next->List::Element::_next; } - le->Element::_next = 0; + le->List::Element::_next = 0; } };