More Sun OS/compiler cleanup

8 files changed, 11 insertions, 47 deletions

diff --git a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
index 256f03cbbdb..f577e2fc217 100644
--- a/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
+++ b/TAO/DevGuideExamples/AMH_AMI/AMH_AMI.mpc
@@ -16,12 +16,6 @@ project(*Client): taoclient, messaging {
     middleC.cpp
     client.cpp
   }
-  // To avoid link errors with SunCC 5.[34], put this project's
-  // object files (and resulting SunWS_cache directory) in a different
-  // location than the default.
-  verbatim(gnuace, macros) {
-    VDIR = $(if $(ARCH),$(ARCH)/).obj/AMH_AMI_Client/
-  }
 }
 
 project(*Middle_Server): messaging, taoserver, amh {
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
index 5409f0b4406..b5f8d353c3d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp
@@ -158,10 +158,6 @@ TAO_EC_Basic_Factory::destroy_scheduling_strategy (TAO_EC_Scheduling_Strategy* x
 TAO_EC_ProxyPushConsumer_Collection*
 TAO_EC_Basic_Factory::create_proxy_push_consumer_collection (TAO_EC_Event_Channel_Base *)
 {
-#if defined (__SUNPRO_CC)
-  // This typedef is a workaround for a SunCC 4.2 bug
-  typedef TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator TAO_EC_Consumer_List_Iterator;
-#endif
   return new TAO_ESF_Delayed_Changes<TAO_EC_ProxyPushConsumer,
       TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>,
       TAO_ESF_Proxy_List<TAO_EC_ProxyPushConsumer>::Iterator,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index 62b3afe1ddc..05a518b049c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -107,7 +107,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads ()
       load = ((system_ll - idle_ll) * 100 / system_ll)  / sys_info.dwNumberOfProcessors;
     }
 
-#elif defined (ACE_LINUX) || defined (sun)
+#elif defined (ACE_LINUX)
 
   // Only bother getting the load average over the last minute.
   //
@@ -198,7 +198,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads ()
     throw CORBA::TRANSIENT ();  // Correct exception?
 #endif
 
-#if defined (ACE_LINUX) || defined (sun) || defined(__NetBSD__) || defined (__APPLE__)
+#if defined (ACE_LINUX) || defined(__NetBSD__) || defined (__APPLE__)
   CosLoadBalancing::LoadList * tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     CosLoadBalancing::LoadList (1),
@@ -222,7 +222,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads ()
   ACE_UNUSED_ARG (load);
   throw CORBA::NO_IMPLEMENT ();
 
-#endif  /* linux || sun || __NetBSD__ || __APPLE__ */
+#endif  /* linux || __NetBSD__ || __APPLE__ */
 
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 4dc1ecb2214..d991ba35514 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -124,7 +124,7 @@ TAO_LB_CPU_Utilization_Monitor::loads ()
 {
   CORBA::Float load = 0;
 
-#if defined (ACE_LINUX) || defined (sun)
+#if defined (ACE_LINUX)
   double load_double = calc_cpu_loading ();
   load = load_double;
 
@@ -153,7 +153,7 @@ TAO_LB_CPU_Utilization_Monitor::loads ()
   ACE_UNUSED_ARG (load);
   throw CORBA::NO_IMPLEMENT ();
 
-#endif  /* linux || sun */
+#endif  /* linux */
 
 }
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 4894a456b24..e9481bcd951 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -21,10 +21,6 @@
 #include "ace/OS_NS_strings.h"
 #include <memory>
 
-#if defined (sun)
-# include <sys/lwp.h> /* for _lwp_self */
-#endif /* sun */
-
 Test_ECG::Test_ECG ()
   : lcl_name_ ("Test_ECG"),
     rmt_name_ (""),
@@ -60,22 +56,13 @@ Test_ECG::Test_ECG ()
 void
 print_priority_info (const char *const name)
 {
-#if defined (ACE_HAS_PTHREADS) || defined (sun)
+#if defined (ACE_HAS_PTHREADS)
 #if defined (ACE_HAS_PTHREADS)
   struct sched_param param;
   int policy, status;
 
   if ((status = pthread_getschedparam (pthread_self (), &policy,
                                        &param)) == 0) {
-#   ifdef sun
-    ACE_DEBUG ((LM_DEBUG,
-                "%C (%lu|%u); policy is %d, priority is %d\n",
-                name,
-                ACE_OS::getpid (),
-                _lwp_self (),
-                pthread_self (),
-                policy, param.sched_priority));
-#   else  /* ! sun */
     ACE_DEBUG ((LM_DEBUG,
                 "%C (%lu|%u); policy is %d, priority is %d\n",
                 name,
@@ -83,7 +70,6 @@ print_priority_info (const char *const name)
                 0,
                 pthread_self (),
                 policy, param.sched_priority ));
-#   endif /* ! sun */
   } else {
     ACE_DEBUG ((LM_DEBUG,"pthread_getschedparam failed: %d\n", status));
   }
@@ -119,7 +105,7 @@ print_priority_info (const char *const name)
 #endif /* sun */
 #else
   ACE_UNUSED_ARG (name);
-#endif /* ACE_HAS_PTHREADS || sun */
+#endif /* ACE_HAS_PTHREADS */
 }
 
 int
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index a8fa7f3af1e..5769b24876a 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -57,12 +57,6 @@ project(nestea server) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta
     nestea_server_i.cpp
     nestea_server.cpp
   }
-  // To avoid link errors with SunCC 5.[34], put this project's
-  // object files (and resulting SunWS_cache directory) in a different
-  // location than the default.
-  verbatim(gnuace, macros) {
-    VDIR = $(if $(ARCH),$(ARCH)/).obj/nestea_server/
-  }
 }
 
 project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iortable {
@@ -77,11 +71,5 @@ project(nestea client) : portableserver, orbsvcsexe, avoids_minimum_corba, iorta
     nestea_client_i.cpp
     nestea_client.cpp
   }
-  // To avoid link errors with SunCC 5.[34], put this project's
-  // object files (and resulting SunWS_cache directory) in a different
-  // location than the default.
-  verbatim(gnuace, macros) {
-    VDIR = $(if $(ARCH),$(ARCH)/).obj/nestea_client/
-  }
 }
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
index 3901ea0491d..3d1bbe2684d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/MessengerClient.cpp
@@ -55,7 +55,7 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Detection of closed on read currently not working certain platforms.
-#if defined (sun) || defined (__FreeBSD_version)
+#if defined (__FreeBSD_version)
   return 2;
 #endif
 
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
index be12aa0b2b0..3df1a5da8d2 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -3,12 +3,12 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
 
-// On SunOS 5.8 and MacOS X, the static initialization trick used
+// On MacOS X, the static initialization trick used
 // in the CosNotification_Serv library does not work.  Including the
 // initializer class here works around the problem.
-#if defined (sun) || defined (__APPLE__)
+#if defined (__APPLE__)
 #include "orbsvcs/Notify/CosNotify_Initializer.h"
-#endif /* sun || __APPLE__ */
+#endif /* __APPLE__ */
 
 #include "tao/TimeBaseC.h"
 #include "tao/corba.h"