Cleanup Solaris support

13 files changed, 18 insertions, 29 deletions

diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index d2a9f33c2a1..8ec3b162ffe 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -90,7 +90,7 @@ Driver::run (int argc, ACE_TCHAR* argv[])
 
       int min_priority =
         ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
-        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+      // Enable FIFO scheduling
 
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                                   min_priority,
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index 66b26fc2ac2..0202dcaee91 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -84,7 +84,7 @@ ECMS_Driver::run (int argc, ACE_TCHAR* argv[])
 
       int min_priority =
         ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
-        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+      // Enable FIFO scheduling
 
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                                   min_priority,
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
index a4be43018e0..28afc4f0a1f 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
@@ -27,7 +27,7 @@ ECM_Federation::supplier_types () const
 ACE_INLINE const char*
 ECM_Federation::supplier_name (CORBA::ULong i) const
 {
-  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_))
+  if (i < static_cast<CORBA::ULong> (this->supplier_types_))
     return this->supplier_names_[i];
   return 0;
 }
@@ -35,7 +35,7 @@ ECM_Federation::supplier_name (CORBA::ULong i) const
 ACE_INLINE CORBA::ULong
 ECM_Federation::supplier_ipaddr (CORBA::ULong i) const
 {
-  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->supplier_types_))
+  if (i < static_cast<CORBA::ULong> (this->supplier_types_))
     return this->supplier_ipaddr_[i];
   return 0;
 }
@@ -49,7 +49,7 @@ ECM_Federation::consumer_types () const
 ACE_INLINE const char*
 ECM_Federation::consumer_name (CORBA::ULong i) const
 {
-  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_))
+  if (i < static_cast<CORBA::ULong> (this->consumer_types_))
     return this->consumer_names_[i];
   return 0;
 }
@@ -57,7 +57,7 @@ ECM_Federation::consumer_name (CORBA::ULong i) const
 ACE_INLINE CORBA::ULong
 ECM_Federation::consumer_ipaddr (CORBA::ULong i) const
 {
-  if (i < static_cast<ACE_CAST_CONST CORBA::ULong> (this->consumer_types_))
+  if (i < static_cast<CORBA::ULong> (this->consumer_types_))
     return this->consumer_ipaddr_[i];
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index c0f9d476954..4894a456b24 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -222,7 +222,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
 
       int min_priority =
         ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
-        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+      // Enable FIFO scheduling
 
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                                   min_priority,
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index a10cc5b53ad..403a38f8f75 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -93,10 +93,9 @@ ECT_Consumer_Driver::run (int argc, ACE_TCHAR* argv[])
             }
         }
 
-      int min_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
-        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+      int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
 
+      // Enable FIFO scheduling
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                                   min_priority,
                                                   ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index 4168b9c133c..4dc0053f3b6 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -104,10 +104,9 @@ ECT_Supplier_Driver::run (int argc, ACE_TCHAR* argv[])
             }
         }
 
-      int min_priority =
-        ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
-        // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+      int min_priority = ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
 
+      // Enable FIFO scheduling
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                                   min_priority,
                                                   ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index d2eaa541490..cc1bc13d837 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -136,10 +136,9 @@ ECT_Throughput::run (int argc, ACE_TCHAR* argv[])
       int priority =
         (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
          + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-      priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-      // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
+      priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority);
 
+      // Enable FIFO scheduling
       if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                                   priority,
                                                   ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
index e467d335503..2837ba34dbb 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/RTEC_MCast_Federated/EchoEventSupplierMain.cpp
@@ -153,8 +153,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     TAO_ECG_UDP_Out_Endpoint endpoint;
     // need to be explicit about the address type when built with
     // IPv6 support, otherwise SOCK_DGram::open defaults to ipv6 when
-    // given a sap_any address. This causes trouble on at least solaris
-    // and windows, or at most on not-linux.
+    // given a sap_any address. This causes trouble on at least windows,
+    // or at most on not-linux.
     if (endpoint.dgram ().open (ACE_Addr::sap_any,
                                 send_addr.get_type()) == -1)
       {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index f3644488f24..b5b82c362ff 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -27,8 +27,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
                                                   priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
+  // Enable FIFO scheduling
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                               priority,
                                               ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 91415ec499c..4310fd57c57 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -26,8 +26,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
                                                   priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
+  // Enable FIFO scheduling
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                               priority,
                                               ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index c297a9147e3..b72b31e0d90 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -220,8 +220,8 @@ EC_Driver::move_to_rt_class ()
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
                                                   priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
 
+  // Enable FIFO scheduling
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
                                               priority,
                                               ACE_SCOPE_PROCESS)) != 0)
diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
index f9cc8fd812f..f45ddef340f 100755
--- a/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/Replication/run_test.pl
@@ -167,9 +167,6 @@ print STDERR "Starting Client: $prog $args\n";
 $CL = $test->CreateProcess ("$prog", "$args");
 
 # Some systems may take a very long time to process 100 objects.
-# For example, on a Solaris/SPARC system it was found that it took
-# 8 seconds to bind 100 objects compared to 0.08 seconds on a
-# Linux/Intel computer. So add to the wait time.
 $client = $CL->SpawnWaitKill ($test->ProcessStartWaitInterval() + 105);
 
 if ($client != 0) {
diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/README b/TAO/orbsvcs/tests/Miop/McastLocal/README
index 89fb093b9c5..1d6d2bc44db 100644
--- a/TAO/orbsvcs/tests/Miop/McastLocal/README
+++ b/TAO/orbsvcs/tests/Miop/McastLocal/README
@@ -17,11 +17,6 @@ loopback interface (via its
 This is testing that these configuartion options are correctly working
 for MIOP.
 ***********************************
-Note
-This test currently fails on Solaris (at least ultra10)
-as loopback multicasting seems to have a hardcoded (and unchangeable) SndSock
-size of 0. It then throws away all data that is being sent by the client,
-therefore the servers will timeout as they won't receive any message.
 
 Some other systems (MacOS) also have problems with loopback
 multicasting issuing errno such as "Network/address unreachable" for each