Tried fixing errors on NT

11 files changed, 44 insertions, 44 deletions

diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 9c2bbad114d..7fccdacb97c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -1619,8 +1619,8 @@ TAO_Base_StreamEndPoint::get_control_callback (const char * /*flowname*/,
 }
 
 void
-TAO_Base_StreamEndPoint::set_flow_handler (const char */*flowname*/,
-                                           TAO_AV_Flow_Handler */*handler*/)
+TAO_Base_StreamEndPoint::set_flow_handler (const char * /*flowname*/,
+                                           TAO_AV_Flow_Handler * /*handler*/)
 {
 }
 
@@ -3889,8 +3889,8 @@ TAO_FlowEndPoint::TAO_FlowEndPoint (const char *flowname,
 }
 
 void
-TAO_FlowEndPoint::set_flow_handler (const char */*flowname*/,
-                               TAO_AV_Flow_Handler */*handler*/)
+TAO_FlowEndPoint::set_flow_handler (const char * /*flowname*/,
+                               TAO_AV_Flow_Handler * /*handler*/)
 {
 }
 
@@ -4403,8 +4403,8 @@ TAO_FlowEndPoint::connect_to_peer_i (TAO_FlowSpec_Entry::Role role,
 }
 
 int
-TAO_FlowEndPoint::set_protocol_object (const char */*flowname*/,
-                                                     TAO_AV_Protocol_Object */*object*/)
+TAO_FlowEndPoint::set_protocol_object (const char * /*flowname*/,
+                                       TAO_AV_Protocol_Object * /*object*/)
 {
   return 0;
 }
@@ -4428,7 +4428,7 @@ TAO_FlowProducer::TAO_FlowProducer (const char *flowname,
 
 // gets the reverse channel for feedback.
 char *
-TAO_FlowProducer::get_rev_channel (const char */*pcol_name*/,
+TAO_FlowProducer::get_rev_channel (const char * /*pcol_name*/,
                                    CORBA::Environment &/* ACE_TRY_ENV */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
index f98863df02a..c562671f357 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -32,7 +32,7 @@ class TAO_FlowSpec_Entry;
 //forward declaration.
 class TAO_AV_Transport_Factory;
 
-class TAO_Export TAO_AV_Transport_Item
+class TAO_ORBSVCS_Export TAO_AV_Transport_Item
 {
 public:
   TAO_AV_Transport_Item (const ACE_CString &name);
@@ -59,7 +59,7 @@ private:
 
 class TAO_AV_Flow_Protocol_Factory;
 
-class TAO_Export TAO_AV_Flow_Protocol_Item
+class TAO_ORBSVCS_Export TAO_AV_Flow_Protocol_Item
 {
 public:
   TAO_AV_Flow_Protocol_Item (const ACE_CString &name);
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 6deb81ea0af..f3cbfb7e9ce 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -64,7 +64,7 @@ TAO_AV_UDP_MCast_Transport::~TAO_AV_UDP_MCast_Transport (void)
 }
 
 int
-TAO_AV_UDP_MCast_Transport::open (ACE_Addr */*address*/)
+TAO_AV_UDP_MCast_Transport::open (ACE_Addr * /*address*/)
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index b804f4652ba..3b5ecf0e58e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -64,7 +64,7 @@ TAO_AV_Callback::handle_stop (void)
 }
 
 int
-TAO_AV_Callback::receive_frame (ACE_Message_Block */*frame*/,
+TAO_AV_Callback::receive_frame (ACE_Message_Block * /*frame*/,
                                 TAO_AV_frame_info *,
                                 const ACE_Addr &)
 {
@@ -87,14 +87,14 @@ TAO_AV_Callback::handle_destroy (void)
 }
 
 void
-TAO_AV_Callback::get_timeout (ACE_Time_Value *&/*tv*/,
-                              void *&/*arg*/)
+TAO_AV_Callback::get_timeout (ACE_Time_Value *& /*tv*/,
+                              void *& /*arg*/)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::get_timeout\n"));
 }
 
 int
-TAO_AV_Callback::handle_timeout (void */*arg*/)
+TAO_AV_Callback::handle_timeout (void * /*arg*/)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_Callback::handle_timeout\n"));
   return 0;
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
index 7b99db62e9f..7e7772c4be6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.cpp
@@ -554,11 +554,10 @@ TAO_AV_RTCP::handle_input (ACE_Message_Block *data,
 ACE_UINT32
 TAO_AV_RTCP::alloc_srcid (ACE_UINT32 addr)
 {
-  timeval tv;
-  ::gettimeofday(&tv, 0);
-  ACE_UINT32 srcid = ACE_UINT32 (tv.tv_sec + tv.tv_usec);
-  srcid += (ACE_UINT32)getuid();
-  srcid += (ACE_UINT32)getpid();
+  ACE_Time_Value tv = ACE_OS::gettimeofday ();
+  ACE_UINT32 srcid = ACE_UINT32 (tv.sec () + tv.usec ());
+  srcid += (ACE_UINT32)ACE_OS::getuid();
+  srcid += (ACE_UINT32)ACE_OS::getpid();
   srcid += addr;
   return (srcid);
 }
@@ -633,7 +632,7 @@ TAO_AV_RTCP_Object::handle_input (void)
 
 int
 TAO_AV_RTCP_Object::send_frame (ACE_Message_Block *frame,
-                                TAO_AV_frame_info */*frame_info*/)
+                                TAO_AV_frame_info * /*frame_info*/)
 {
   return this->transport_->send (frame);
 }
@@ -641,7 +640,7 @@ TAO_AV_RTCP_Object::send_frame (ACE_Message_Block *frame,
 int
 TAO_AV_RTCP_Object::send_frame (const iovec *iov,
                                int iovcnt,
-                                TAO_AV_frame_info */*frame_info*/)
+                                TAO_AV_frame_info * /*frame_info*/)
 {
   return this->transport_->send (iov,
                                  iovcnt);
@@ -768,7 +767,7 @@ TAO_AV_RTCP_Callback::handle_stop (void)
 }
 
 int
-TAO_AV_RTCP_Callback::handle_timeout (void */*arg*/)
+TAO_AV_RTCP_Callback::handle_timeout (void * /*arg*/)
 {
   // Here we do the send_report.
   TAO_AV_RTCP::send_report (0,
@@ -781,7 +780,7 @@ TAO_AV_RTCP_Callback::handle_timeout (void */*arg*/)
 
 void
 TAO_AV_RTCP_Callback::get_timeout (ACE_Time_Value *&tv,
-                                   void *&/*arg*/)
+                                   void *& /*arg*/)
 {
   // Here we do the RTCP timeout calculation.
   ACE_NEW (tv,
diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
index 1a4335491cd..36d994ddca5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -22,7 +22,7 @@ TAO_AV_TCP_Transport::~TAO_AV_TCP_Transport (void)
 }
 
 int
-TAO_AV_TCP_Transport::open (ACE_Addr */*address*/)
+TAO_AV_TCP_Transport::open (ACE_Addr * /*address*/)
 {
   return 0;
 }
@@ -213,7 +213,7 @@ TAO_AV_TCP_Object::handle_input (void)
 
 int
 TAO_AV_TCP_Object::send_frame (ACE_Message_Block *frame,
-                               TAO_AV_frame_info */*frame_info*/)
+                               TAO_AV_frame_info * /*frame_info*/)
 {
   int result = this->transport_->send (frame);
   if (result < 0)
@@ -224,7 +224,7 @@ TAO_AV_TCP_Object::send_frame (ACE_Message_Block *frame,
 int
 TAO_AV_TCP_Object::send_frame (const iovec *iov,
                                int iovcnt,
-                               TAO_AV_frame_info */*frame_info*/)
+                               TAO_AV_frame_info * /*frame_info*/)
 {
   return this->transport_->send (iov,iovcnt);
 }
@@ -562,7 +562,7 @@ TAO_AV_TCP_Acceptor::close (void)
 // TAO_AV_TCP_Flow_Handler
 //------------------------------------------------------------
 
-TAO_AV_TCP_Flow_Handler::TAO_AV_TCP_Flow_Handler (TAO_AV_Callback */*callback*/)
+TAO_AV_TCP_Flow_Handler::TAO_AV_TCP_Flow_Handler (TAO_AV_Callback * /*callback*/)
   //  :TAO_AV_Flow_Handler (callback)
 {
   ACE_NEW (this->transport_,
@@ -576,7 +576,7 @@ TAO_AV_TCP_Flow_Handler::transport (void)
 }
 
 int
-TAO_AV_TCP_Flow_Handler::open (void */*arg*/)
+TAO_AV_TCP_Flow_Handler::open (void * /*arg*/)
 {
 
   int nodelay = 1;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 1fbd6faa572..8833fb84cb4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -1175,8 +1175,8 @@ TAO_AV_Flow_Handler::stop (TAO_FlowSpec_Entry::Role role)
 }
 
 int
-TAO_AV_Flow_Handler::handle_timeout (const ACE_Time_Value &/*tv*/,
-                                     const void */*arg*/)
+TAO_AV_Flow_Handler::handle_timeout (const ACE_Time_Value & /*tv*/,
+                                     const void * /*arg*/)
 {
   this->callback_->handle_timeout (this->timeout_arg_);
   ACE_Event_Handler *event_handler = this->event_handler ();
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 7ec54c4fb56..531f5a117e0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -88,7 +88,7 @@ TAO_AV_UDP_Transport::set_remote_address (const ACE_INET_Addr &address)
 }
 
 int
-TAO_AV_UDP_Transport::open (ACE_Addr */*address*/)
+TAO_AV_UDP_Transport::open (ACE_Addr * /*address*/)
 {
   return 0;
 }
@@ -622,7 +622,7 @@ TAO_AV_UDP_Object::handle_input (void)
 
 int
 TAO_AV_UDP_Object::send_frame (ACE_Message_Block *frame,
-                               TAO_AV_frame_info */*frame_info*/)
+                               TAO_AV_frame_info * /*frame_info*/)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Object::send_frame\n"));
   int result = this->transport_->send (frame);
@@ -634,7 +634,7 @@ TAO_AV_UDP_Object::send_frame (ACE_Message_Block *frame,
 int 
 TAO_AV_UDP_Object::send_frame (const iovec *iov,
                                int iovcnt,
-                               TAO_AV_frame_info */*frame_info*/)
+                               TAO_AV_frame_info * /*frame_info*/)
 {
   return this->transport_->send (iov,iovcnt);
 }
diff --git a/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp b/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp
index ccd1281f557..3098eef34f5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/media-timer.cpp
@@ -63,12 +63,12 @@ MediaTimer::~MediaTimer()
  */
 ACE_UINT32 MediaTimer::media_ts()
 {
-        timeval tv;
-        ::gettimeofday(&tv, 0);
-        ACE_UINT32 u = tv.tv_usec;
-        u = (u << 3) + u; /* x 9 */
+  //timeval tv;
+  ACE_Time_Value tv = ACE_OS::gettimeofday();
+  ACE_UINT32 u = tv.usec ();
+  u = (u << 3) + u; /* x 9 */
         /* sec * 90Khz + (usec * 90Khz) / 1e6 */
-        u = tv.tv_sec * 90000 + (u / 100);
+        u = tv.sec () * 90000 + (u / 100);
         return (u + offset_);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
index d6cf15ec3ae..2e2399d342e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -82,9 +82,10 @@ ntptime (timeval t)
 ACE_INLINE ACE_UINT32 
 ntptime()
 {
-  struct timeval tv;
-        ::gettimeofday(&tv, 0);
-        return (ntptime(tv));
+  //
+ ACE_Time_Value tim_v = ACE_OS::gettimeofday();
+ //struct timeval tv = (timeval) tim_v;
+        return (ntptime ((timeval) tim_v));
 }
 
 ACE_INLINE timeval unixtime()
diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
index bd114a00376..41afcf3597c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -1187,9 +1187,9 @@ TAO_SFP_Object::send_frame (ACE_Message_Block *frame,
 }
 
 int 
-TAO_SFP_Object::send_frame (const iovec */*iov*/,
+TAO_SFP_Object::send_frame (const iovec * /*iov*/,
                             int /*iovcnt*/,
-                            TAO_AV_frame_info */*frame_info*/)
+                            TAO_AV_frame_info * /*frame_info*/)
 {
   ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_SFP_Object::send_frame"),-1);
 }
@@ -1388,7 +1388,7 @@ TAO_AV_SFP_Factory::~TAO_AV_SFP_Factory (void)
 
 // Initialization hook from service configurator.
 int
-TAO_AV_SFP_Factory::init (int /*argc*/, char **/*argv*/)
+TAO_AV_SFP_Factory::init (int /*argc*/, char ** /*argv*/)
 {
   return 0;
 }