1 files changed, 8 insertions, 15 deletions

diff --git a/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 75d1ae02c5d..10b0777b219 100644
--- a/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -23,10 +23,6 @@
 #include "EC_Mcast.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (EC_Mcast,
-           EC_Mcast,
-           "$Id$")
-
 ECM_Driver::ECM_Driver (void)
   : event_period_ (250000),
     event_count_ (100),
@@ -205,8 +201,7 @@ ECM_Driver::open_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
 {
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->open (this->event_count_,
-                                         ec);
+      this->local_federations_[i]->open (this->event_count_, ec);
     }
 }
 
@@ -218,8 +213,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec)
   interval *= 10;
   for (int i = 0; i < this->local_federations_count_; ++i)
     {
-      this->local_federations_[i]->activate (ec,
-                                             interval);
+      this->local_federations_[i]->activate (ec, interval);
     }
 }
 
@@ -256,8 +250,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec)
       ACE_NEW (clone,
                TAO_ECG_UDP_Out_Endpoint (this->endpoint_));
 
-      this->all_federations_[i]->open (clone,
-                                       ec);
+      this->all_federations_[i]->open (clone, ec);
     }
 }
 
@@ -743,7 +736,7 @@ ECM_Consumer::ECM_Consumer (ECM_Local_Federation *federation)
 void
 ECM_Consumer::open (const char*,
                     RtecEventChannelAdmin::EventChannel_ptr ec,
-                    ACE_RANDR_TYPE &seed)
+                    unsigned int *seed)
 {
   // The worst case execution time is far less than 2
   // milliseconds, but that is a safe estimate....
@@ -758,7 +751,7 @@ ECM_Consumer::open (const char*,
 }
 
 void
-ECM_Consumer::connect (ACE_RANDR_TYPE &seed)
+ECM_Consumer::connect (unsigned int *seed)
 {
   if (CORBA::is_nil (this->consumer_admin_.in ()))
     return;
@@ -887,7 +880,7 @@ ECM_Local_Federation::open (int event_count,
 
   ACE_OS::strcpy (buf, this->federation_->name ());
   ACE_OS::strcat (buf, "/consumer");
-  this->consumer_.open (buf, ec, this->seed_);
+  this->consumer_.open (buf, ec, &this->seed_);
 
   this->last_subscription_change_ = ACE_OS::gettimeofday ();
 }
@@ -940,7 +933,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
   ACE_Time_Value delta = ACE_OS::gettimeofday () -
     this->last_subscription_change_;
 
-  unsigned int x = ACE_OS::rand_r (this->seed_);
+  unsigned int x = ACE_OS::rand_r (&this->seed_);
   double p = double (x) / RAND_MAX;
   double maxp = double (delta.msec ()) / this->subscription_change_period_;
 
@@ -950,7 +943,7 @@ ECM_Local_Federation::supplier_timeout (RtecEventComm::PushConsumer_ptr consumer
                   "Reconfiguring federation %s: %f %f [%d]\n",
                   this->name (), p, maxp, x));
       this->consumer_.disconnect ();
-      this->consumer_.connect (this->seed_);
+      this->consumer_.connect (&this->seed_);
       this->last_subscription_change_ = ACE_OS::gettimeofday ();
     }
 }