diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h | 6 |
3 files changed, 0 insertions, 16 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/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index f60dd53129b..e6b26cbb72e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -54,13 +54,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Busy_Lock.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Busy_Lock.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("EC_Busy_Lock.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #include /**/ "ace/post.h" #endif /* TAO_EC_BUSY_LOCK_H */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 83fd3944ffa..5f8ab69c0fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -91,12 +91,6 @@ TAO_END_VERSIONED_NAMESPACE_DECL #include "orbsvcs/Event/EC_Lifetime_Utils_T.inl" #endif /* __ACE_INLINE__ */ -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("EC_Lifetime_Utils_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #endif /* EC_LIFETIME_UTILS_T_H */ |