ChangeLogTag:Sat May 6 15:37:25 2000 Carlos O'Ryan <coryan@uci.edu>

10 files changed, 76 insertions, 58 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 1e361dc3349..3b956557ef6 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,20 @@
+Sat May  6 15:37:25 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Full_Profile/server.cpp:
+        * orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Multicast/server.cpp:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/ftp.cpp:
+        * orbsvcs/tests/AVStreams/Pluggable/server.cpp:
+          Removed several warnings and a couple of errors from these
+          tests.
+
+        * tests/Param_Test/tmplinst.cpp:
+          Add missing template instantiation, or at least it is missing on
+          IRIX.
+
 Sat May  6 15:19:52 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * orbsvcs/orbsvcs/Makefile.RTSched:
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index d4b7eb10945..d805f97666e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -91,7 +91,7 @@ FTP_Client_Producer::FTP_Client_Producer (void)
   :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
 {
 }
-  
+
 int
 FTP_Client_Producer::set_protocol_object (const char *,
                                           TAO_AV_Protocol_Object *object)
@@ -116,9 +116,9 @@ Client::parse_args (int argc,
                     char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:a:p:s");
-  
+
   this->use_sfp_ = 0;
-  char c;
+  int c;
   while ((c= opts ()) != -1)
     {
       switch (c)
@@ -210,7 +210,7 @@ Client::bind_to_server (void)
                            " (%P|%t) Unable to initialize "
                            "the TAO_Naming_Client. \n"),
                           -1);
-      
+
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
@@ -277,7 +277,7 @@ Client::init (int argc,char **argv)
                       0);
       ACE_OS::sprintf (this->flowname_,
                        "Data");
-                       
+
       this->fdev_->flowname (this->flowname ());
       AVStreams::MMDevice_var mmdevice = this->client_mmdevice_._this (ACE_TRY_ENV);
       ACE_TRY_CHECK;
@@ -300,7 +300,7 @@ Client::init (int argc,char **argv)
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
         }
       if (this->bind_to_server () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
     }
@@ -341,7 +341,7 @@ Client::run (void)
       ACE_High_Res_Timer timer;
       ACE_Time_Value elapsed;
       timer.start ();
-      CORBA::Boolean result = 
+      CORBA::Boolean result =
         this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV),
                                      this->server_mmdevice_.in (),
                                      the_qos.inout (),
@@ -376,7 +376,7 @@ main (int argc,
       char **argv)
 {
   TAO_debug_level++;
-    
+
   int result = 0;
   result = CLIENT::instance ()->init (argc,argv);
   if (result < 0)
@@ -394,6 +394,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,A
 template class TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl> 
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl> 
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,AV_Null_MediaCtrl>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index ef45ea5ca36..e59d5f8e539 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -77,7 +77,7 @@ FTP_Server_Callback::handle_end_stream (void)
 // {
 // }
 
-// AVStreams::FlowConsumer_ptr 
+// AVStreams::FlowConsumer_ptr
 // FTP_Server_FDev::make_consumer (AVStreams::FlowConnection_ptr the_requester,
 //                                 AVStreams::QoS & the_qos,
 //                                 CORBA::Boolean_out met_qos,
@@ -126,7 +126,7 @@ Server::init (int argc,
                                       argv,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      this->orb_manager_ = 
+      this->orb_manager_ =
         TAO_AV_CORE::instance ()->orb_manager ();
 
       // Initialize the orb_manager
@@ -223,7 +223,7 @@ Server::parse_args (int argc,char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:p:");
 
-  char c;
+  int c;
   while ((c = opts ()) != -1)
     {
       switch (c)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 9c8e94c908e..d80bd3e0554 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -62,7 +62,7 @@ FTP_Client_Callback::handle_timeout (void *)
     }
   if (n == 0)
     {
-      if (::feof (CLIENT::instance ()->file ()))
+      if (feof (CLIENT::instance ()->file ()))
         {
           // wait for sometime for the data to be flushed to the other side.
           this->count_++;
@@ -132,7 +132,7 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *flowname,
 // {
 //   ACE_DEBUG ((LM_DEBUG,"FTP_Client_Flow_Handler::start"));
 //   ACE_Time_Value delta = ACE_Time_Value::zero;
-//   this->timer_id_ =  
+//   this->timer_id_ =
 //     TAO_AV_CORE::instance ()->reactor ()->schedule_timer (this,
 //                                                           0,
 //                                                           delta,
@@ -224,9 +224,9 @@ Client::parse_args (int argc,
                     char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:a:p:s");
-  
+
   this->use_sfp_ = 0;
-  char c;
+  int c;
   while ((c= opts ()) != -1)
     {
       switch (c)
@@ -400,7 +400,7 @@ Client::run (void)
                                         &addr);
       flow_spec [0] = entry.entry_to_string ();
       flow_spec.length (1);
-      CORBA::Boolean result = 
+      CORBA::Boolean result =
         this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
@@ -408,7 +408,7 @@ Client::run (void)
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice1") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
@@ -418,7 +418,7 @@ Client::run (void)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice2") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
@@ -468,6 +468,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO
 template class TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 80431bfa31d..90cfcdf4cb3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -71,7 +71,7 @@ Server::init (int argc,
                                       argv,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      this->orb_manager_ = 
+      this->orb_manager_ =
         TAO_AV_CORE::instance ()->orb_manager ();
 
       // Initialize the orb_manager
@@ -167,7 +167,7 @@ Server::parse_args (int argc,char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:p:");
 
-  char c;
+  int c;
   while ((c = opts ()) != -1)
     {
       switch (c)
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 1b24ee981f1..5c2753238a2 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -47,7 +47,7 @@
 // {
 //   ACE_DEBUG ((LM_DEBUG,"FTP_Client_Flow_Handler::start"));
 //   ACE_Time_Value delta = ACE_Time_Value::zero;
-//   this->timer_id_ =  
+//   this->timer_id_ =
 //     TAO_AV_CORE::instance ()->reactor ()->schedule_timer (this,
 //                                                           0,
 //                                                           delta,
@@ -81,7 +81,7 @@
 //     }
 //   if (n == 0)
 //     {
-//       if (::feof (CLIENT::instance ()->file ()))
+//       if (feof (CLIENT::instance ()->file ()))
 //         {
 //           // wait for sometime for the data to be flushed to the other side.
 //           this->count_++;
@@ -209,7 +209,7 @@ FTP_Client_Producer::FTP_Client_Producer (void)
   :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ())
 {
 }
-  
+
 int
 FTP_Client_Producer::set_protocol_object (const char *,
                                           TAO_AV_Protocol_Object *object)
@@ -234,9 +234,9 @@ Client::parse_args (int argc,
                     char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:a:p:sd");
-  
+
   this->use_sfp_ = 0;
-  char c;
+  int c;
   while ((c= opts ()) != -1)
     {
       switch (c)
@@ -331,7 +331,7 @@ Client::bind_to_server (const char *name)
                            " (%P|%t) Unable to initialize "
                            "the TAO_Naming_Client. \n"),
                           -1);
-      
+
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = name;
@@ -456,7 +456,7 @@ Client::run (void)
                                         &addr);
       flow_spec [0] = CORBA::string_dup (entry.entry_to_string ());
       flow_spec.length (1);
-      CORBA::Boolean result = 
+      CORBA::Boolean result =
         this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV),
                                      AVStreams::MMDevice::_nil (),
                                      the_qos.inout (),
@@ -464,7 +464,7 @@ Client::run (void)
                                      ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice1") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
@@ -474,7 +474,7 @@ Client::run (void)
                                             ACE_TRY_ENV);
       ACE_TRY_CHECK;
       if (this->bind_to_server ("Server_MMDevice2") == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
       result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (),
@@ -525,7 +525,7 @@ template class TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_A,TAO_VDev,A
 template class TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #pragma instantiate TAO_FDev<FTP_Client_Producer, TAO_FlowConsumer>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index 0a3007492c8..8440d4484b0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -76,7 +76,7 @@ FTP_Server_Callback::handle_end_stream (void)
 // {
 // }
 
-// AVStreams::FlowConsumer_ptr 
+// AVStreams::FlowConsumer_ptr
 // FTP_Server_FDev::make_consumer (AVStreams::FlowConnection_ptr the_requester,
 //                                 AVStreams::QoS & the_qos,
 //                                 CORBA::Boolean_out met_qos,
@@ -125,7 +125,7 @@ Server::init (int argc,
                                       argv,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      this->orb_manager_ = 
+      this->orb_manager_ =
         TAO_AV_CORE::instance ()->orb_manager ();
 
       // Initialize the orb_manager
@@ -232,7 +232,7 @@ Server::parse_args (int argc,char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:p:");
 
-  char c;
+  int c;
   while ((c = opts ()) != -1)
     {
       switch (c)
@@ -285,4 +285,3 @@ template class TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>;
 #pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<TAO_StreamEndPoint_B, TAO_VDev, AV_Null_MediaCtrl>;
 #pragma instantiate TAO_FDev<TAO_FlowProducer, FTP_Server_FlowEndPoint>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index d573f918855..723f91f2d72 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -79,7 +79,7 @@ FTP_Client_Callback::handle_timeout (void *)
           this->count_++;
           if (this->count_ == 2)
             {
-              //@@coryan: Remove these code from this method. 
+              //@@coryan: Remove these code from this method.
               //Should be called when the user wants to stop the stream.
               ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n"));
               AVStreams::flowSpec stop_spec (1);
@@ -88,7 +88,7 @@ FTP_Client_Callback::handle_timeout (void *)
               ACE_CHECK_RETURN (-1);
               CLIENT::instance ()->streamctrl ()->destroy (stop_spec,ACE_TRY_ENV);
               TAO_AV_CORE::instance ()->stop_run ();
-              
+
             }
           else
             return 0;
@@ -154,9 +154,9 @@ Client::parse_args (int argc,
                     char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:a:p:sdt");
-  
+
   this->use_sfp_ = 0;
-  char c;
+  int c;
   while ((c= opts ()) != -1)
     {
       switch (c)
@@ -229,7 +229,7 @@ Client::bind_to_server (void)
                            " (%P|%t) Unable to initialize "
                            "the TAO_Naming_Client. \n"),
                           -1);
-      
+
       CosNaming::Name server_mmdevice_name (1);
       server_mmdevice_name.length (1);
       server_mmdevice_name [0].id = CORBA::string_dup ("Server_MMDevice");
@@ -302,10 +302,10 @@ Client::init (int argc,char **argv)
         {
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
         }
-      
-      
+
+
       if (this->bind_to_server () == -1)
-        ACE_ERROR_RETURN ((LM_ERROR, 
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "(%P|%t) Error binding to the naming service\n"),
                           -1);
     }
@@ -353,7 +353,7 @@ Client::run (void)
       //ACE_High_Res_Timer timer;
       //ACE_Time_Value elapsed;
       // timer.start ();
-      CORBA::Boolean result = 
+      CORBA::Boolean result =
         this->streamctrl_.bind_devs (this->client_mmdevice_._this (ACE_TRY_ENV),
                                      this->server_mmdevice_.in (),
                                      the_qos.inout (),
@@ -397,7 +397,7 @@ int
 main (int argc,
       char **argv)
 {
-  
+
   int result = 0;
   result = CLIENT::instance ()->init (argc,argv);
   if (result < 0)
@@ -408,9 +408,9 @@ main (int argc,
   ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
-  
+
   recv_latency.dump_results ("Receive", gsf);
-  
+
   send_latency.dump_results ("Send", gsf);
 }
 
@@ -420,6 +420,6 @@ template class TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO
 template class TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Singleton <Client,ACE_Null_Mutex>
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
-#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl> 
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy_A<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
+#pragma instantiate TAO_AV_Endpoint_Reactive_Strategy<FTP_Client_StreamEndPoint,TAO_VDev,AV_Null_MediaCtrl>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index 1479e9f6b72..0cd31e81475 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -48,9 +48,9 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame,
       //                           FTP_SERVER::instance ()->file ());
       if (frame->length () < sizeof(stamp))
         return 0;
-      
+
       ACE_OS::memcpy (&stamp, frame->rd_ptr (), sizeof(stamp));
-      
+
       ACE_hrtime_t now = ACE_OS::gethrtime ();
       if (recv_base == 0)
         {
@@ -94,7 +94,7 @@ Server::init (int argc,
                                       argv,
                                       ACE_TRY_ENV);
       ACE_TRY_CHECK;
-      this->orb_manager_ = 
+      this->orb_manager_ =
         TAO_AV_CORE::instance ()->orb_manager ();
 
       // Initialize the orb_manager
@@ -178,7 +178,7 @@ Server::parse_args (int argc,char **argv)
 {
   ACE_Get_Opt opts (argc,argv,"f:p:");
 
-  char c;
+  int c;
   while ((c = opts ()) != -1)
     {
       switch (c)
@@ -220,7 +220,7 @@ main (int argc,
   ACE_DEBUG ((LM_DEBUG, "Calibrating scale factory . . . "));
   ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
   ACE_DEBUG ((LM_DEBUG, "done\n"));
-  
+
   recv_latency.dump_results ("Receive", gsf);
 }
 
diff --git a/TAO/tests/Param_Test/tmplinst.cpp b/TAO/tests/Param_Test/tmplinst.cpp
index 823aed80fdf..e8e7d45c514 100644
--- a/TAO/tests/Param_Test/tmplinst.cpp
+++ b/TAO/tests/Param_Test/tmplinst.cpp
@@ -9,6 +9,7 @@ ACE_RCSID(Param_Test, tmplinst, "$Id$")
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class TAO_Unbounded_Sequence<CORBA::Any>;
+template class TAO_Unbounded_Sequence<CORBA::Long>;
 template class TAO_Bounded_Sequence<CORBA::Long,32>;
 template class TAO_Unbounded_Sequence<CORBA::Short>;
 template class TAO_Bounded_Sequence<CORBA::Short,32>;
@@ -21,6 +22,7 @@ template class TAO_Unbounded_Array_Sequence<Param_Test::Fixed_Array,Param_Test::
 template class TAO_Bounded_Array_Sequence<Param_Test::Fixed_Array,Param_Test::Fixed_Array_var,32>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::Any>
+#pragma instantiate TAO_Unbounded_Sequence<CORBA::Long>
 #pragma instantiate TAO_Bounded_Sequence<CORBA::Long,32>
 #pragma instantiate TAO_Unbounded_Sequence<CORBA::Short>
 #pragma instantiate TAO_Bounded_Sequence<CORBA::Short,32>