Avoiding ambiguities in the cList template class in case one defines a 'list of lists'

3 files changed, 7 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b6bd60ae..ce0ffaa5 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -128,6 +128,8 @@ Stefan Huelswitt <huels@iname.com>
  with CAMs and AC3 sound only working the first time
  for making the main loop take an active video cutting process into account when
  doing shutdown or housekeeping
+ for making the cList template class avoid ambiguities in case one defines a "list of
+ lists"
 
 Ulrich Röder <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than
diff --git a/HISTORY b/HISTORY
index 22483da9..447db9d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1262,3 +1262,5 @@ Video Disk Recorder Revision History
   is the actual implementation for the DVB hardware. This is in preparation for
   allowing additional kinds of OSD hardware implementations.
 - Fixed leftover references to the file FORMATS in MANUAL and svdrp.c.
+- Avoiding ambiguities in the cList template class in case one defines a "list of
+  lists" (thanks to Stefan Huelswitt).
diff --git a/tools.h b/tools.h
index 08a56723..bf064ce7 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 1.42 2002/02/17 12:57:44 kls Exp $
+ * $Id: tools.h 1.43 2002/05/11 08:35:47 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -147,8 +147,8 @@ public:
   T *Get(int Index) const { return (T *)cListBase::Get(Index); }
   T *First(void) const { return (T *)objects; }
   T *Last(void) const { return (T *)lastObject; }
-  T *Prev(const T *object) const { return (T *)object->Prev(); }
-  T *Next(const T *object) const { return (T *)object->Next(); }
+  T *Prev(const T *object) const { return (T *)object->cListObject::Prev(); } // need to call cListObject's members to
+  T *Next(const T *object) const { return (T *)object->cListObject::Next(); } // avoid ambiguities in case of a "list of lists"
   };
 
 #endif //__TOOLS_H