summaryrefslogtreecommitdiff
path: root/ace/Timer_List_T.cpp
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-09-24 20:18:12 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-09-24 20:18:12 +0000
commit0db914b751e1de78bf4b2f815d018ec2badff376 (patch)
tree9c0da6d0229cef4b9bbfa9e6362c5d3582540980 /ace/Timer_List_T.cpp
parent60db53677397f511c2f33bb77e3cb3802bf6ef24 (diff)
downloadATCD-0db914b751e1de78bf4b2f815d018ec2badff376.tar.gz
changed name of "list" argument ot "listParam" to avoid name clash with STL
Diffstat (limited to 'ace/Timer_List_T.cpp')
-rw-r--r--ace/Timer_List_T.cpp6
1 files changed, 4 insertions, 2 deletions
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