From 0db914b751e1de78bf4b2f815d018ec2badff376 Mon Sep 17 00:00:00 2001
From: levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Wed, 24 Sep 1997 20:18:12 +0000
Subject: changed name of "list" argument ot "listParam" to avoid name clash
 with STL

---
 ace/Timer_List_T.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ace/Timer_List_T.cpp')

diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index 60d1fe12cf9..676d027cb80 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -9,9 +9,11 @@
 
 // Default Constructor
 
+// WARNING:  _Please_ do not change the name of the "listParam" argument
+//           to "list"!  Otherwise, we'll have name clashes with STL!
 template <class TYPE, class FUNCTOR, class LOCK>
-ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, LOCK>::ACE_Timer_List_Iterator_T (ACE_Timer_List_T<TYPE, FUNCTOR, LOCK> &list)
-  : timer_list_ (list)
+ACE_Timer_List_Iterator_T<TYPE, FUNCTOR, LOCK>::ACE_Timer_List_Iterator_T (ACE_Timer_List_T<TYPE, FUNCTOR, LOCK> &listParam)
+  : timer_list_ (listParam)
 {
   this->first();
   // Nothing
-- 
cgit v1.2.1