diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
3 files changed, 5 insertions, 9 deletions
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 */ } |