ChangeLogTag:Mon Nov 6 16:23:56 2000 Carlos O'Ryan <coryan@uci.edu>

6 files changed, 31 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 0c3bcc6b3ac..eb17f310bae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Nov  6 16:23:56 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+          Fixed warnings reported by DU/CXX
+
 Sun Nov  5 17:23:55 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * etc/ace.doxygen:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0c3bcc6b3ac..eb17f310bae 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Mon Nov  6 16:23:56 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+          Fixed warnings reported by DU/CXX
+
 Sun Nov  5 17:23:55 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * etc/ace.doxygen:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0c3bcc6b3ac..eb17f310bae 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Mon Nov  6 16:23:56 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tests/RMCast/RMCast_Fragment_Test.cpp:
+        * tests/RMCast/RMCast_Reassembly_Test.cpp:
+        * tests/RMCast/RMCast_Retransmission_Test.cpp:
+          Fixed warnings reported by DU/CXX
+
 Sun Nov  5 17:23:55 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * etc/ace.doxygen:
diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp
index f3a3e1ea7b3..2369ebf9a5a 100644
--- a/tests/RMCast/RMCast_Fragment_Test.cpp
+++ b/tests/RMCast/RMCast_Fragment_Test.cpp
@@ -99,7 +99,6 @@ ACE_RMCast_Fragment_Tester::svc (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Mismatched big_blob data\n")),
                           -1);
-        return -1;
       }
 
   }
@@ -142,7 +141,6 @@ ACE_RMCast_Fragment_Tester::svc (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Mismatched small chain data\n")),
                           -1);
-        return -1;
       }
 
   }
@@ -191,7 +189,6 @@ ACE_RMCast_Fragment_Tester::svc (void)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("Mismatched small chain data\n")),
                           -1);
-        return -1;
       }
 
   }
diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp
index 7c4cc575cd2..dba5bffa34a 100644
--- a/tests/RMCast/RMCast_Reassembly_Test.cpp
+++ b/tests/RMCast/RMCast_Reassembly_Test.cpp
@@ -64,8 +64,8 @@ main (int, ACE_TCHAR *[])
   ACE_RMCast_Reassembly_Tester tester;
 
   if (tester.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, 
-                       ACE_TEXT ("Cannot activate the threads\n")), 
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       ACE_TEXT ("Cannot activate the threads\n")),
                       1);
 
   ACE_Thread_Manager::instance ()->wait ();
@@ -87,7 +87,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
 {
   for (int iteration = 0; iteration != 50; ++iteration)
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) iteration %d\n"), iteration));     
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) iteration %d\n"), iteration));
       ACE_UINT32 sequence_number = this->next_sequence_number ();
       {
         ACE_Message_Block received;
@@ -123,11 +123,10 @@ ACE_RMCast_Reassembly_Tester::svc (void)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("Mismatched big_blob data\n")),
                               -1);
-            return -1;
           }
       }
 
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) iteration %d, first test passed\n"),
                   iteration));
       sequence_number = this->next_sequence_number ();
@@ -185,10 +184,9 @@ ACE_RMCast_Reassembly_Tester::svc (void)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("Mismatched random big_blob data\n")),
                               -1);
-            return -1;
           }
       }
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t) iteration %d, random test passed\n"),
                   iteration));
     }
diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp
index a69f2129718..3352692ccc8 100644
--- a/tests/RMCast/RMCast_Retransmission_Test.cpp
+++ b/tests/RMCast/RMCast_Retransmission_Test.cpp
@@ -128,7 +128,7 @@ public:
    * however we just do brute force instead of trying to optimize the
    * Ack processing
    */
-  int ack (Test_Proxy *proxy, ACE_RMCast::Ack &ack);
+  int proxy_received_ack (Test_Proxy *proxy, ACE_RMCast::Ack &ack);
 
   virtual int data (ACE_RMCast::Data &data);
 
@@ -202,8 +202,8 @@ main (int, ACE_TCHAR *[])
     Tester tester;
     Task task (&tester);
     if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                         ACE_TEXT ("Cannot activate the threads\n")), 
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("Cannot activate the threads\n")),
                         1);
     ACE_Thread_Manager::instance ()->wait ();
     tester.validate_message_count ();
@@ -287,7 +287,7 @@ Tester::reply_ack_join (Test_Proxy *, ACE_RMCast::Ack_Join &ack_join)
 }
 
 int
-Tester::ack (Test_Proxy *, ACE_RMCast::Ack &)
+Tester::proxy_received_ack (Test_Proxy *, ACE_RMCast::Ack &)
 {
   return this->send_ack ();
 }
@@ -485,7 +485,7 @@ int
 Test_Proxy::ack (ACE_RMCast::Ack &ack)
 {
   (void) this->ACE_RMCast_Proxy::ack (ack);
-  (void) this->tester_->ack (this, ack);
+  (void) this->tester_->proxy_received_ack (this, ack);
   return 0;
 }