From f01f42fdd7d68b1cf377945c173e54e4d75b0832 Mon Sep 17 00:00:00 2001 From: Martin Stein Date: Thu, 24 May 2012 11:52:11 +0200 Subject: [PATCH] Avoid ambiguousness of entry members in FIFO --- base/include/util/fifo.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/base/include/util/fifo.h b/base/include/util/fifo.h index 9955b6ee0..709765002 100644 --- a/base/include/util/fifo.h +++ b/base/include/util/fifo.h @@ -67,15 +67,15 @@ namespace Genode { */ void enqueue(QT *e) { - e->_next = 0; - e->_is_enqueued = true; + e->Fifo::Element::_next = 0; + e->Fifo::Element::_is_enqueued = true; if (empty()) { _tail = _head = e; return; } - _tail->_next = e; + _tail->Fifo::Element::_next = e; _tail = e; } @@ -92,12 +92,12 @@ namespace Genode { if (_head == _tail) _head = _tail = 0; else - _head = _head->_next; + _head = _head->Fifo::Element::_next; /* mark fifo queue element as free */ if (result) { - result->_next = 0; - result->_is_enqueued = false; + result->Fifo::Element::_next = 0; + result->Fifo::Element::_is_enqueued = false; } return result;