ChangeLogTag: Tue Aug 16 19:00:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 4 insertions, 4 deletions

diff --git a/apps/JAWS2/JAWS/Assoc_Array.cpp b/apps/JAWS2/JAWS/Assoc_Array.cpp
index d5caf4d32cb..36fc7d64763 100644
--- a/apps/JAWS2/JAWS/Assoc_Array.cpp
+++ b/apps/JAWS2/JAWS/Assoc_Array.cpp
@@ -65,7 +65,7 @@ JAWS_Assoc_Array<KEY,DATA>::find (const KEY &k)
 }
 
 template <class KEY, class DATA> DATA *
-JAWS_Assoc_Array<KEY,DATA>::find (int i)
+JAWS_Assoc_Array<KEY,DATA>::find_by_index (int i)
 {
   return ((0 <= i) && (i < this->maxsize_)) ? this->d_array_[i] : 0;
 }
diff --git a/apps/JAWS2/JAWS/Assoc_Array.h b/apps/JAWS2/JAWS/Assoc_Array.h
index 2adb6de7d0d..d5692a5cf03 100644
--- a/apps/JAWS2/JAWS/Assoc_Array.h
+++ b/apps/JAWS2/JAWS/Assoc_Array.h
@@ -23,7 +23,7 @@ public:
   DATA * find (const KEY &k);
   // Returns the data associated with key k.  0 if not found.
 
-  DATA * find (int i);
+  DATA * find_by_index (int i);
   // Returns the data associated with array index i.  Returns 0 if the
   // index is invalid.
 
diff --git a/apps/JAWS2/JAWS/Concurrency.cpp b/apps/JAWS2/JAWS/Concurrency.cpp
index 915f67a7d65..34b0d94149f 100644
--- a/apps/JAWS2/JAWS/Concurrency.cpp
+++ b/apps/JAWS2/JAWS/Concurrency.cpp
@@ -146,7 +146,7 @@ JAWS_Concurrency_Base::svc_hook (JAWS_Data_Block *ts_db)
           if (handler)
             handler->done ();
           handler = 0;
-          JAWS_IO_Handler **ioh = waiter->find (waiter_index);
+          JAWS_IO_Handler **ioh = waiter->find_by_index (waiter_index);
           *ioh = 0;
           break;
         }
@@ -187,7 +187,7 @@ JAWS_Concurrency_Base::svc_hook (JAWS_Data_Block *ts_db)
           handler = 0;
           if (result == -2)
             {
-              JAWS_IO_Handler **ioh = waiter->find (waiter_index);
+              JAWS_IO_Handler **ioh = waiter->find_by_index (waiter_index);
               *ioh = 0;
               result = 0;
             }