summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-07-27 20:54:56 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2006-07-27 20:54:56 +0000
commit1df3b4414122de77b38400ee34a5997d633dcc2c (patch)
tree030efd5e63c2010505194526b2c136aa0e0649e3 /TAO/orbsvcs
parent30102243920c57c8c73120186ef6f23d00357499 (diff)
downloadATCD-1df3b4414122de77b38400ee34a5997d633dcc2c.tar.gz
Thu Jul 27 20:50:17 UTC 2006 William R. Otte <wotte@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs')
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.cpp2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.h2
-rw-r--r--TAO/orbsvcs/examples/Security/Send_File/test_i.inl (renamed from TAO/orbsvcs/examples/Security/Send_File/test_i.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl (renamed from TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl (renamed from TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/MCast.inl (renamed from TAO/orbsvcs/orbsvcs/AV/MCast.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Policy.inl (renamed from TAO/orbsvcs/orbsvcs/AV/Policy.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl (renamed from TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/Transport.inl (renamed from TAO/orbsvcs/orbsvcs/AV/Transport.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/AV/UDP.inl (renamed from TAO/orbsvcs/orbsvcs/AV/UDP.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl (renamed from TAO/orbsvcs/orbsvcs/Channel_Clients_T.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl (renamed from TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl (renamed from TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl (renamed from TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Filter.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl (renamed from TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Event_Utilities.inl (renamed from TAO/orbsvcs/orbsvcs/Event_Utilities.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl (renamed from TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl (renamed from TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl (renamed from TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl (renamed from TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl (renamed from TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl (renamed from TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl (renamed from TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl (renamed from TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl (renamed from TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl (renamed from TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl (renamed from TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl (renamed from TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl (renamed from TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl (renamed from TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl (renamed from TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/DynSched.inl (renamed from TAO/orbsvcs/orbsvcs/Sched/DynSched.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl (renamed from TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl (renamed from TAO/orbsvcs/orbsvcs/Scheduler_Factory.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl (renamed from TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i)0
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.cpp2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.h2
-rw-r--r--TAO/orbsvcs/orbsvcs/Time_Utilities.inl (renamed from TAO/orbsvcs/orbsvcs/Time_Utilities.i)0
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h2
-rw-r--r--TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl (renamed from TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i)0
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.cpp2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.h2
-rw-r--r--TAO/orbsvcs/tests/Event/lib/Driver.inl (renamed from TAO/orbsvcs/tests/Event/lib/Driver.i)0
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl (renamed from TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.i)0
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl (renamed from TAO/orbsvcs/tests/Security/Crash_Test/test_i.i)0
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h2
-rw-r--r--TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl (renamed from TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i)0
312 files changed, 208 insertions, 208 deletions
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
index 62d1ff2e04a..93ba5bb076d 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.cpp
@@ -3,7 +3,7 @@
#include "test_i.h"
#if !defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Send_File, test_i, "$Id$")
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.h b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
index 10b18e60116..f0c4aa7be58 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.h
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.h
@@ -43,7 +43,7 @@ private:
};
#if defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
#endif /* TAO_SEND_FILE_TEST_I_H */
diff --git a/TAO/orbsvcs/examples/Security/Send_File/test_i.i b/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
index 97524552ff4..97524552ff4 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/test_i.i
+++ b/TAO/orbsvcs/examples/Security/Send_File/test_i.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 3b21cf04246..a3bd5a0947f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -25,7 +25,7 @@
#include "ace/OS_NS_arpa_inet.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/AVStreams_i.i"
+#include "orbsvcs/AV/AVStreams_i.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (AV,
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 8e23294c9bc..38c3c75e711 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -1527,7 +1527,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
#include "tao/debug.h"
-#include "orbsvcs/AV/AVStreams_i.i"
+#include "orbsvcs/AV/AVStreams_i.inl"
#endif /* __ACE_INLINE__ */
#include "orbsvcs/AV/Flows_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
index 81731c09f05..81731c09f05 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 76476dafb8b..da2f6835561 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -12,7 +12,7 @@
#include "ace/OS_NS_strings.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/FlowSpec_Entry.i"
+#include "orbsvcs/AV/FlowSpec_Entry.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
index 58f018bc45e..bc5b0aa1ba2 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -352,7 +352,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#include "orbsvcs/AV/Transport.h"
#if defined (__ACE_INLINE__)
-#include "orbsvcs/AV/FlowSpec_Entry.i"
+#include "orbsvcs/AV/FlowSpec_Entry.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
index 3af4438dd98..3af4438dd98 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
index 5ccb9148c4f..f47c64117bd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -5,7 +5,7 @@
#include "tao/debug.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/MCast.i"
+#include "orbsvcs/AV/MCast.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h
index fde288896ed..b48e2cc4179 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -110,7 +110,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/MCast.i"
+#include "orbsvcs/AV/MCast.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.i b/TAO/orbsvcs/orbsvcs/AV/MCast.inl
index 08d994f23ed..08d994f23ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.i
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
index 0fa94820c07..b622379edaf 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/AV/Policy.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/AV/Policy.i"
+#include "orbsvcs/AV/Policy.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index a34a9604e22..11deb4c3d0b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -168,7 +168,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/Policy.i"
+#include "orbsvcs/AV/Policy.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.i b/TAO/orbsvcs/orbsvcs/AV/Policy.inl
index 3ff570e0e6f..3ff570e0e6f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.i
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
index 19aba484619..87feb7f4b9a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -11,7 +11,7 @@
#include "orbsvcs/AV/Fill_ACE_QoS.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/QoS_UDP.i"
+#include "orbsvcs/AV/QoS_UDP.inl"
#endif /* __ACE_INLINE__ */
//------------------------------------------------------------
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
index 7100217f263..6eb2d8d8af5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h
@@ -297,7 +297,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory)
#if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/QoS_UDP.i"
+#include "orbsvcs/AV/QoS_UDP.inl"
#endif /* __ACE_INLINE__ */
#endif /* ACE_HAS_RAPI || ACE_HAS_WINSOCK2_GQOS */
diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
index 9ae1b828b0f..9ae1b828b0f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
index 03047ef23e6..7b3321188d0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -19,7 +19,7 @@
#include "ace/Dynamic_Service.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/Transport.i"
+#include "orbsvcs/AV/Transport.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index e494a20b9d4..c6e3f63ba57 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -338,7 +338,7 @@ public:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/AV/Transport.i"
+#include "orbsvcs/AV/Transport.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.i b/TAO/orbsvcs/orbsvcs/AV/Transport.inl
index c05c2474e2b..c05c2474e2b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.i
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.inl
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 827079c3c90..cb141df2b2c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -8,7 +8,7 @@
#include "ace/OS_NS_strings.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/UDP.i"
+#include "orbsvcs/AV/UDP.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (AV,
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h
index f582af25ec7..d7137bdd92d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -288,7 +288,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory)
#if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/UDP.i"
+#include "orbsvcs/AV/UDP.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.i b/TAO/orbsvcs/orbsvcs/AV/UDP.inl
index 72025b94dd5..72025b94dd5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.inl
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
index 80eeaf1d7ac..f79296289ab 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Channel_Clients_T.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
+#include "orbsvcs/Channel_Clients_T.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 10071d978ea..9f56182745b 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -84,7 +84,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Channel_Clients_T.i"
+#include "orbsvcs/Channel_Clients_T.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl
index 3c21f6c9bb2..3c21f6c9bb2 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 298c8981d9d..ac6dce9b64a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -9,7 +9,7 @@
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
index 529e6a28197..aba60f615c6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.h
@@ -149,7 +149,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
index d7761a1f51d..d7761a1f51d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
index 19b4f4d46d6..581ae6e2b04 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.cpp
@@ -37,7 +37,7 @@
#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Default_Factory.i"
+#include "orbsvcs/CosEvent/CEC_Default_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
index 8f072c7bd62..2cdfc8e1a98 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -220,7 +220,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Default_Factory.i"
+#include "orbsvcs/CosEvent/CEC_Default_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_STATIC_SVC_DECLARE (TAO_CEC_Default_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
index 0dd3d37f8cb..0dd3d37f8cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 363d2600717..5911d5c109d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -7,7 +7,7 @@
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i"
+#include "orbsvcs/CosEvent/CEC_Dispatching_Task.inl"
#endif /* __ACE_INLINE__ */
#include "ace/OS_NS_errno.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
index fcdcb8a564a..5c213395a89 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h
@@ -157,7 +157,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i"
+#include "orbsvcs/CosEvent/CEC_Dispatching_Task.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
index 1432528492a..1432528492a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
index 75813fad39b..f00965a58b2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -9,7 +9,7 @@
#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i"
+#include "orbsvcs/CosEvent/CEC_DynamicImplementation.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
index 98c4b91c1cd..80d065c6c83 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -78,7 +78,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i"
+#include "orbsvcs/CosEvent/CEC_DynamicImplementation.inl"
#endif /* __ACE_INLINE__ */
#endif /* TAO_CEC_DYNAMICIMPLEMENTATION_H */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
index 2f1bff715f7..2f1bff715f7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 11fb1dd92d7..6d85505f431 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -10,7 +10,7 @@
#include "ace/Dynamic_Service.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_EventChannel.i"
+#include "orbsvcs/CosEvent/CEC_EventChannel.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(CosEvent, CEC_EventChannel, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
index b25f91e9054..e7ac5d173e2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -308,7 +308,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_EventChannel.i"
+#include "orbsvcs/CosEvent/CEC_EventChannel.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
index 23f8e906f7c..23f8e906f7c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
index 4aedb1f17c0..ba48e98cea8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -9,7 +9,7 @@
#include "ace/Reverse_Lock_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
index 1949abadced..033e4e5476f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -150,7 +150,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
index 3c22bfb9af4..3c22bfb9af4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
index 99208b46ef1..ecadbc25ecf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -7,7 +7,7 @@
#include "ace/Reverse_Lock_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
index 67eca07678f..fa84ba336da 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -174,7 +174,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
index 8519794c295..8519794c295 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
index dc056d83a65..c65d0968f98 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -8,7 +8,7 @@
#include "ace/Reverse_Lock_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
index a7922405f2a..574670778c5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -202,7 +202,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
index 422c95863c6..422c95863c6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
index a25b00b5942..b213428c4ed 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.cpp
@@ -23,7 +23,7 @@
#include "ace/Reverse_Lock_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
index ab39589a301..d6fd0f41987 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -225,7 +225,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i"
+#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
index 9f92df16b06..9f92df16b06 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
index 934fc6e4c82..d6c54e6d063 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -27,7 +27,7 @@
#include "ace/Reactor.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
index f1cc2e40767..16f6923d049 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -205,7 +205,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
index cd61d83efce..cd61d83efce 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
index 55063132e47..fd58a376e20 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -17,7 +17,7 @@
#include "ace/Reactor.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(CosEvent, CEC_Reactive_Pulling_Strategy, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
index a43c423f3a3..43a8735e82b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -143,7 +143,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
index 319de5688f5..319de5688f5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
index b7a49603b36..cd355c6c968 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -28,7 +28,7 @@
#include "ace/Reactor.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
index bd7cbe1fd94..da0433e2385 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.h
@@ -221,7 +221,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i"
+#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
index e166f46ecf6..e166f46ecf6 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
index e667fe96e0d..6735b37cf40 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (CosEvent,
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
index a1e67f65c71..7a9b06f4c3c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -119,7 +119,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_SupplierAdmin.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
index ec420d2c576..ec420d2c576 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
index 69c08a7b739..eb44b1cbf9f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
index 72925fb2c00..6fd7eeb02dd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -122,7 +122,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
index 37a0dd30d28..37a0dd30d28 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
index 9142e04e6bb..477dd349409 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
@@ -5,5 +5,5 @@
#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEvent.i"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
index 8dff16f8bf1..cba0833e71c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -61,7 +61,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEvent.i"
+#include "orbsvcs/CosEvent/CEC_TypedEvent.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
index 4c8f0aab997..4c8f0aab997 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
index f29d1421580..66c4a913cdd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -14,7 +14,7 @@
#include "ace/Reactor.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index d41f719f6d4..dcec1e0713c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -385,7 +385,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
+#include "orbsvcs/CosEvent/CEC_TypedEventChannel.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
index ec52c543383..ec52c543383 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
index cdb9787b230..d352ff988c9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -9,7 +9,7 @@
#include "tao/debug.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl"
#endif /* __ACE_INLINE__ */
#include "ace/Reverse_Lock_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
index 9595edd9420..1e4e92bf612 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -202,7 +202,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i"
+#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
index 86eee941060..86eee941060 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.inl
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
index a156440cc16..fe047155c0f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
index eaa3747387f..d7c29fb9f81 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -101,7 +101,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i"
+#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
index 4a3111bc176..4a3111bc176 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
index 0cca17fb185..48e75601245 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Busy_Lock.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Busy_Lock.i"
+#include "orbsvcs/ESF/ESF_Busy_Lock.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
index 2c112e4f25e..2e540ea1b5d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -66,7 +66,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Busy_Lock.i"
+#include "orbsvcs/ESF/ESF_Busy_Lock.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
index 8c39a00c2e9..8c39a00c2e9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
index 169f5eac972..cd6173e3181 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Copy_On_Write.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Copy_On_Write.i"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.inl"
#endif /* __ACE_INLINE__ */
#include "tao/Environment.h"
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
index a34659b6e57..d4a6d9af9c1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -170,7 +170,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Copy_On_Write.i"
+#include "orbsvcs/ESF/ESF_Copy_On_Write.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
index d3ad3d108c7..d3ad3d108c7 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
index 5398387800c..67c61362f21 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Changes.i"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.inl"
#endif /* __ACE_INLINE__ */
#include "orbsvcs/ESF/ESF_Defaults.h"
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
index 2bf47dd49b4..350f756867e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h
@@ -146,7 +146,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Changes.i"
+#include "orbsvcs/ESF/ESF_Delayed_Changes.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
index 4a2192e5a18..4a2192e5a18 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index fe0a7812db0..e47522719c4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Delayed_Command.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Command.i"
+#include "orbsvcs/ESF/ESF_Delayed_Command.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
index a827c4e6415..8901a51c3f1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
@@ -173,7 +173,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Command.i"
+#include "orbsvcs/ESF/ESF_Delayed_Command.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
index 3ffe5697959..3ffe5697959 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
index c1bbac9dad0..ff3e7daa3c4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Immediate_Changes.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Immediate_Changes.i"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.inl"
#endif /* __ACE_INLINE__ */
#include "orbsvcs/ESF/ESF_Worker.h"
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
index bcd9b19edd4..574f6f559db 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.h
@@ -55,7 +55,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Immediate_Changes.i"
+#include "orbsvcs/ESF/ESF_Immediate_Changes.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
index ac26e4d5800..ac26e4d5800 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
index 354daec8bed..7016971b2f3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Peer_Workers.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Peer_Workers.i"
+#include "orbsvcs/ESF/ESF_Peer_Workers.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
index 793e41f422e..913a3403549 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -93,7 +93,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Peer_Workers.i"
+#include "orbsvcs/ESF/ESF_Peer_Workers.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
index 02201bde5d5..02201bde5d5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
index 8449b48d0b2..68407b8a0ea 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -4,7 +4,7 @@
#define TAO_ESF_PROXY_ADMIN_CPP
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_Admin.i"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.inl"
#endif /* __ACE_INLINE__ */
#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
index 5c56884654e..e42104dae90 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -153,7 +153,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_Admin.i"
+#include "orbsvcs/ESF/ESF_Proxy_Admin.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
index 882e6c9c056..882e6c9c056 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
index ebe73ce7996..3b9a49c729c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Proxy_List.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_List.i"
+#include "orbsvcs/ESF/ESF_Proxy_List.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
index f2697bd7dbf..a50358146d3 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -74,7 +74,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_List.i"
+#include "orbsvcs/ESF/ESF_Proxy_List.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
index 67d752fdc6c..67d752fdc6c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
index 000b91f27d9..f3bcdaa5a6b 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
index e4c6ce6f9a0..34a4fe9522e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -100,7 +100,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i"
+#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
index b67178bf7b5..b67178bf7b5 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
index 5e236899e02..f9d67c5a5e8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
index 7e2f9e4c160..cac01eb47f4 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -65,7 +65,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
index d0d4fc80ac1..d0d4fc80ac1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
index ae87b7f97f1..18415bd9fc0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/ESF/ESF_RefCount_Guard.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(ESF, ESF_RefCount_Guard, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
index 84569c79bb6..2bf75f0b5f6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -53,7 +53,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_RefCount_Guard.i"
+#include "orbsvcs/ESF/ESF_RefCount_Guard.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
index de454aaefe0..de454aaefe0 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
index a0db9862e3f..e7347443f4c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp
@@ -7,7 +7,7 @@
#include "ace/CORBA_macros.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
index 7263e4b2445..6f9af5a6705 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -38,7 +38,7 @@ public:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i"
+#include "orbsvcs/ESF/ESF_Shutdown_Proxy.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
index 51955993b3d..51955993b3d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
index faf377fd386..d5e98c5d91b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.cpp
@@ -10,7 +10,7 @@
#include "ace/OS_NS_string.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Receiver.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
index 8159a4e2f15..500f4b2eb4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.h
@@ -310,7 +310,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Receiver.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
index 078166a6088..078166a6088 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
index be2af5fe269..6a6492dd90c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -7,7 +7,7 @@
#include "ace/ACE.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, ECG_CDR_Message_Sender, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
index 0f7d8b723ba..3c22ae7efb4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -182,7 +182,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.i"
+#include "orbsvcs/Event/ECG_CDR_Message_Sender.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
index aa1242d07fe..aa1242d07fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
index 3091fb79acf..ad383d44565 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -5,7 +5,7 @@
#include "ace/streams.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Complex_Address_Server.i"
+#include "orbsvcs/Event/ECG_Complex_Address_Server.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
index bbe55390465..28e2277a04d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -110,7 +110,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Complex_Address_Server.i"
+#include "orbsvcs/Event/ECG_Complex_Address_Server.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
index b47e2db3e68..b47e2db3e68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index e72dafca760..ed3acdc46f9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -10,7 +10,7 @@
#include "ace/os_include/os_fcntl.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_EH.i"
+#include "orbsvcs/Event/ECG_Mcast_EH.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, ECG_Mcast_EH, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 6808a8bbd0d..79393ced36c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -286,7 +286,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_EH.i"
+#include "orbsvcs/Event/ECG_Mcast_EH.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
index 587c2721944..587c2721944 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
index 723466ea888..fc88ebf5ee9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.cpp
@@ -17,7 +17,7 @@
#include "ace/OS_NS_strings.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_Gateway.i"
+#include "orbsvcs/Event/ECG_Mcast_Gateway.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, ECG_Mcast_Gateway, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
index 827d6ae20ac..d25df608dec 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -280,7 +280,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_Gateway.i"
+#include "orbsvcs/Event/ECG_Mcast_Gateway.inl"
#endif /* __ACE_INLINE__ */
ACE_STATIC_SVC_DECLARE (TAO_ECG_Mcast_Gateway)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
index 8e126abb9b6..8e126abb9b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
index 064d5c35183..25d111d0a07 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/ECG_Simple_Address_Server.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Simple_Address_Server.i"
+#include "orbsvcs/Event/ECG_Simple_Address_Server.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
index 4c0cb219ccc..482661168e0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -62,7 +62,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Simple_Address_Server.i"
+#include "orbsvcs/Event/ECG_Simple_Address_Server.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
index 0aa18cada97..0aa18cada97 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
index 257a8ff2c3b..213e0ea32dc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -5,7 +5,7 @@
#include "ace/INET_Addr.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_EH.i"
+#include "orbsvcs/Event/ECG_UDP_EH.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, ECG_UDP_EH, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
index b87d4d9c745..48672ad0feb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -103,7 +103,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_EH.i"
+#include "orbsvcs/Event/ECG_UDP_EH.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
index d84f70937b8..d84f70937b8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
index 8b6fb71a6fe..edde419a2c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -5,7 +5,7 @@
#include "ace/Sock_Connect.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, ECG_UDP_Out_Endpoint, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
index a967401e6e6..5443b6d6485 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -100,7 +100,7 @@ typedef ACE_Refcounted_Auto_Ptr<TAO_ECG_UDP_Out_Endpoint,ACE_Null_Mutex> TAO_ECG
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i"
+#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
index 9f8fd0df5f3..9f8fd0df5f3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
index 1a492f72d66..c9904bf02cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.cpp
@@ -5,7 +5,7 @@
#include "ace/SString.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Receiver.i"
+#include "orbsvcs/Event/ECG_UDP_Receiver.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
index 3b5a4f686dc..4d8002aa862 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -232,7 +232,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Receiver.i"
+#include "orbsvcs/Event/ECG_UDP_Receiver.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
index 47eb3d83958..47eb3d83958 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
index e8149330316..26f4df71ff0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -12,7 +12,7 @@
#include "orbsvcs/Event/EC_Timeout_Filter.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Basic_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Basic_Filter_Builder, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
index f6627fc35c5..91e4c61105f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -73,7 +73,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Basic_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Basic_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
index ebf53c20045..ebf53c20045 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
index f2cce60ee21..904bf799c30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Event/EC_Busy_Lock.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Busy_Lock.i"
+#include "orbsvcs/Event/EC_Busy_Lock.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
index 1640d5b8bf2..e9436b93c4c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -51,7 +51,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Busy_Lock.i"
+#include "orbsvcs/Event/EC_Busy_Lock.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
index 670ad09dd63..670ad09dd63 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
index c10cfbbb4cd..3579aaec4f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.cpp
@@ -35,7 +35,7 @@
#include "ace/Dynamic_Service.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Default_Factory.i"
+#include "orbsvcs/Event/EC_Default_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Default_Factory, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
index a5bce5d5df3..291954518b3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -190,7 +190,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Default_Factory.i"
+#include "orbsvcs/Event/EC_Default_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_STATIC_SVC_DECLARE (TAO_EC_Default_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
index 2564cd3b0c5..2564cd3b0c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index 93b6952aa8d..0dcbf675bd9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -9,7 +9,7 @@
#include "ace/OS_NS_strings.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Dispatching_Task.i"
+#include "orbsvcs/Event/EC_Dispatching_Task.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
index 7aaedd68071..3fcdc312679 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -188,7 +188,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Dispatching_Task.i"
+#include "orbsvcs/Event/EC_Dispatching_Task.inl"
#endif /* __ACE_INLINE__ */
ACE_STATIC_SVC_DECLARE (TAO_EC_Simple_Queue_Full_Action)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
index 37930e408fe..37930e408fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
index cdb208fbb4a..b10f5168dda 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -11,7 +11,7 @@
#include "ace/Dynamic_Service.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Event_Channel_Base.i"
+#include "orbsvcs/Event/EC_Event_Channel_Base.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Event_Channel_Base, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
index b42632c4c43..9027e64de4a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -369,7 +369,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Event_Channel_Base.i"
+#include "orbsvcs/Event/EC_Event_Channel_Base.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
index 1883f84ef11..1883f84ef11 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index 55f0de96038..b8c32a6ad68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -6,7 +6,7 @@
#include "tao/ORB_Constants.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter.i"
+#include "orbsvcs/Event/EC_Filter.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
index d092917ab4e..a08dcf7a711 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h
@@ -217,7 +217,7 @@ public:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter.i"
+#include "orbsvcs/Event/EC_Filter.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
index a5b9e121522..a5b9e121522 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
index 07934456276..8f1bbdb6ea1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -4,7 +4,7 @@
#include "orbsvcs/Event/EC_Filter.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Filter_Builder, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
index 5d639e8d7e0..45d8a6e573b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h
@@ -84,7 +84,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
// ****************************************************************
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
index 89d32fe656e..89d32fe656e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
index ec6b0f935ca..2b62599ff60 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -15,7 +15,7 @@
#include "ace/OS_NS_strings.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i"
+#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
index 2a1c30a10a0..75f924e36f8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -107,7 +107,7 @@ ACE_STATIC_SVC_DECLARE (TAO_EC_Gateway_IIOP_Factory)
ACE_FACTORY_DECLARE (TAO_RTEvent_Serv, TAO_EC_Gateway_IIOP_Factory)
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i"
+#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
index 45dbd3f9d3f..45dbd3f9d3f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 206d87f18a2..7c20f6e0c66 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -15,7 +15,7 @@
#include "Kokyu/Kokyu.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Dispatching.i"
+#include "orbsvcs/Event/EC_Kokyu_Dispatching.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
index d9079a271ac..3e8f0e7c98e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -140,7 +140,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Dispatching.i"
+#include "orbsvcs/Event/EC_Kokyu_Dispatching.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
index 0c116874fad..0c116874fad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
index 2df728b8920..969aeeafd09 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.cpp
@@ -12,7 +12,7 @@
#include "ace/OS_NS_strings.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Factory.i"
+#include "orbsvcs/Event/EC_Kokyu_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
index 4e2f413ca42..faea617a2a4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h
@@ -68,7 +68,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Factory.i"
+#include "orbsvcs/Event/EC_Kokyu_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_STATIC_SVC_DECLARE (TAO_EC_Kokyu_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
index 7119373733f..7119373733f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
index a522ce4d5ac..6012492d79a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.cpp
@@ -11,7 +11,7 @@
#include "ace/OS_NS_stdio.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
index 83ac33a6456..e63b901bab4 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h
@@ -82,7 +82,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
index 8e0cd624a7e..8e0cd624a7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
index 979cd0913fa..8d7e32b9c8e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/Event/EC_Supplier_Filter.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Scheduling.i"
+#include "orbsvcs/Event/EC_Kokyu_Scheduling.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Kokyu_Scheduling, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
index 105241d217a..0384ea70e8f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -70,7 +70,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Scheduling.i"
+#include "orbsvcs/Event/EC_Kokyu_Scheduling.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
index 1afeb35fa05..1afeb35fa05 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
index 9750da7a5d7..a87c7a83d51 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.cpp
@@ -3,5 +3,5 @@
#include "orbsvcs/Event/EC_Lifetime_Utils.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index d34ce3ab484..5ddccd9d18b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -210,7 +210,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
index 2884f04108d..2884f04108d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
index 8a8d4934d40..d454d0c1233 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
index 85b98439126..0a3d886138a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -189,7 +189,7 @@ bool operator!=(TAO_EC_Servant_Var<X> const & x,
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.i"
+#include "orbsvcs/Event/EC_Lifetime_Utils_T.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
index e93998fee0f..e93998fee0f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
index e17a6de3910..f9ddf2d9f68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/Event/EC_Supplier_Filter.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Null_Scheduling.i"
+#include "orbsvcs/Event/EC_Null_Scheduling.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Null_Scheduling, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
index 90857214aeb..fff1ad22617 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h
@@ -52,7 +52,7 @@ private:
};
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Null_Scheduling.i"
+#include "orbsvcs/Event/EC_Null_Scheduling.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
index 60c72cb9e56..60c72cb9e56 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
index e5c5a9bc11d..6dddfd74ecc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -10,7 +10,7 @@
#include "ace/Auto_Ptr.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ObserverStrategy.i"
+#include "orbsvcs/Event/EC_ObserverStrategy.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_ObserverStrategy, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
index 55b8874db7c..86baeedcdc9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -354,7 +354,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ObserverStrategy.i"
+#include "orbsvcs/Event/EC_ObserverStrategy.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
index 231db3f9417..231db3f9417 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
index fe0ed5c6cc8..5a222b54ddd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -12,7 +12,7 @@
#include "orbsvcs/Event_Service_Constants.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Per_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Per_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Per_Supplier_Filter, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
index 868c15d4e00..62d9836fed2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h
@@ -115,7 +115,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Per_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Per_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
index 4c950811fcc..4c950811fcc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
index 61b79c68726..9aea7f9ebd7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -12,7 +12,7 @@
#include "orbsvcs/Event/EC_Timeout_Filter.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Prefix_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Prefix_Filter_Builder, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
index 7938278e895..afa9b699e82 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -65,7 +65,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Prefix_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
index c4ddf4074b0..c4ddf4074b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
index 0bf92510d54..345f9c89a01 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -7,7 +7,7 @@
#include "orbsvcs/Event/EC_Supplier_Filter.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Priority_Scheduling.i"
+#include "orbsvcs/Event/EC_Priority_Scheduling.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Priority_Scheduling, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
index ef5be319f06..0bcf644848a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -69,7 +69,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Priority_Scheduling.i"
+#include "orbsvcs/Event/EC_Priority_Scheduling.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
index 2de353d965e..2de353d965e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
index f16960141c1..315f0a968ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -8,7 +8,7 @@
#include "ace/Reverse_Lock_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxyConsumer.i"
+#include "orbsvcs/Event/EC_ProxyConsumer.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
index e70e0ee6ca2..5ffb2b12c08 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h
@@ -230,7 +230,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxyConsumer.i"
+#include "orbsvcs/Event/EC_ProxyConsumer.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
index 44ef91ef2e7..44ef91ef2e7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
index 37204dcf67b..0512c4962cf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -14,7 +14,7 @@
#include "ace/Reverse_Lock_T.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
index bb14e56895b..c0a4b442c82 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h
@@ -223,7 +223,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
index c64085ea2e1..c64085ea2e1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
index 4680bda962f..1e39f9bb795 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_QOS_Info.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_QOS_Info.i"
+#include "orbsvcs/Event/EC_QOS_Info.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_QOS_Info, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
index 88c9387e382..51b82a309fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -62,7 +62,7 @@ public:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_QOS_Info.i"
+#include "orbsvcs/Event/EC_QOS_Info.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
index eab42f031bc..eab42f031bc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
index a8aafe81f0b..5cc0e3bf3c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp
@@ -12,7 +12,7 @@
#include "ace/Reactor.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Reactive_ConsumerControl, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
index d6e8cf176d5..bcbf77a74a2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h
@@ -147,7 +147,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i"
+#include "orbsvcs/Event/EC_Reactive_ConsumerControl.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
index d365ca2ae4d..d365ca2ae4d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
index 10cdcd05bdb..e6e08c409d5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp
@@ -12,7 +12,7 @@
#include "ace/Reactor.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_SupplierControl.i"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Reactive_SupplierControl, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
index 141ddf9668c..a2e37e70acf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -158,7 +158,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_SupplierControl.i"
+#include "orbsvcs/Event/EC_Reactive_SupplierControl.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
index 3ffaf226464..3ffaf226464 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
index 66c4afcc9ac..1f310ff9de8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.cpp
@@ -12,7 +12,7 @@
#include "ace/OS_NS_strings.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Factory.i"
+#include "orbsvcs/Event/EC_Sched_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Sched_Factory, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
index b7b82d791fc..3a6b4e748ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h
@@ -61,7 +61,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Factory.i"
+#include "orbsvcs/Event/EC_Sched_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_STATIC_SVC_DECLARE (TAO_EC_Sched_Factory)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
index 84cbe2d4a4d..84cbe2d4a4d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
index 95ef9e1886e..833c19b2aac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -11,7 +11,7 @@
#include "ace/OS_NS_stdio.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Sched_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Sched_Filter_Builder, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
index c649518ecbe..8c088259450 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -82,7 +82,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Filter_Builder.i"
+#include "orbsvcs/Event/EC_Sched_Filter_Builder.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
index a00dfd725c5..a00dfd725c5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
index 1f424fd0575..dcd69dbd794 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/Event/EC_QOS_Info.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_Supplier_Filter, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
index 898fdc45e02..30de7bc3afc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -143,7 +143,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Supplier_Filter.i"
+#include "orbsvcs/Event/EC_Supplier_Filter.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
index 9b09afb3d74..9b09afb3d74 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
index 6ead39a342e..651346bb32a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_TPC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_TPC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
index 345b17c0619..3a6ad49db16 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.h
@@ -56,7 +56,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_TPC_ProxySupplier.i"
+#include "orbsvcs/Event/EC_TPC_ProxySupplier.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
index 6a31a5fc0d1..6a31a5fc0d1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
index 3b479983a13..d775c458a12 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -8,7 +8,7 @@
#include "orbsvcs/Event_Service_Constants.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Filter.i"
+#include "orbsvcs/Event/EC_Timeout_Filter.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
index 0658f0b0b46..b9d5fbbacc3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -112,7 +112,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Filter.i"
+#include "orbsvcs/Event/EC_Timeout_Filter.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
index a6e30773801..a6e30773801 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
index 23d098ceba6..2b55f24a2d6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -5,7 +5,7 @@
#include "orbsvcs/Event_Service_Constants.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Generator.i"
+#include "orbsvcs/Event/EC_Timeout_Generator.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Event,
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
index 44a6642de69..af3ec586b66 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -93,7 +93,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Generator.i"
+#include "orbsvcs/Event/EC_Timeout_Generator.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
index aba1263d609..aba1263d609 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
index 4c66ec5087d..9438282afce 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -6,7 +6,7 @@
#include "ace/OS_NS_string.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
+#include "orbsvcs/Event_Utilities.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (orbsvcs,
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.h b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
index 01be03b7517..07b0305eb63 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -248,7 +248,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Event_Utilities.i"
+#include "orbsvcs/Event_Utilities.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.i b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
index 20c09b0a0fe..20c09b0a0fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 4d0bed9f1f8..888884ae81d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
@@ -16,7 +16,7 @@
#include "ace/Auto_Ptr.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/HTIOP/HTIOP_Acceptor.i"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(HTIOP,
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
index 6abbb6f23e9..23607f8b5ac 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
@@ -232,7 +232,7 @@ namespace TAO
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/HTIOP/HTIOP_Acceptor.i"
+#include "orbsvcs/HTIOP/HTIOP_Acceptor.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
index 6b3279c0c04..6b3279c0c04 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
index 2d3e6da6299..c788395bf1d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -15,7 +15,7 @@ ACE_RCSID (HTIOP,
"$Id$")
#if !defined (__ACE_INLINE__)
-# include "orbsvcs/HTIOP/HTIOP_Endpoint.i"
+# include "orbsvcs/HTIOP/HTIOP_Endpoint.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
index 2fa800fd7a4..210d705eb9c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
@@ -155,7 +155,7 @@ namespace TAO
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-# include "orbsvcs/HTIOP/HTIOP_Endpoint.i"
+# include "orbsvcs/HTIOP/HTIOP_Endpoint.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
index dffd4f6705b..dffd4f6705b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.inl
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
index 42663238c81..2cc74f259e0 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Metrics/Metrics_FrameManager.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
index 689ed44ee6f..18be60d8462 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
@@ -18,7 +18,7 @@
#include "orbsvcs/Metrics/Metrics_Utils.h"
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager.inl"
#endif /* __ACE_INLINE__ */
#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl
index bb47ba99272..bb47ba99272 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.inl
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
index d8ff5ef8e8b..f1380473006 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
index a3226d8647c..0335c8bf43c 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.h
@@ -270,7 +270,7 @@ protected:
#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.i"
+#include "orbsvcs/Metrics/Metrics_FrameManager_T.inl"
#endif /* __ACE_INLINE__ */
#endif /* METRICS_FRAME_MANAGER_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
index a14671b359e..a14671b359e 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager_T.inl
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
index c1b7f9eb788..de45d6fb8ca 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Metrics/Metrics_LocalCache.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_LocalCache.i"
+#include "orbsvcs/Metrics/Metrics_LocalCache.inl"
#endif /* __ACE_INLINE__ */
#endif /* METRICS_LOCAL_CACHE_CPP */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
index 71fcb092381..2546ff7d414 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
@@ -103,7 +103,7 @@ METRICS_LOGGER_REF); \
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_LocalCache.i"
+#include "orbsvcs/Metrics/Metrics_LocalCache.inl"
#endif /* __ACE_INLINE__ */
#endif /* ACE_ENABLE_TIMEPROBES && ACE_COMPILE_TIMEPROBES */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl
index a9ccf1b5acd..a9ccf1b5acd 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.inl
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
index fe4ec645da8..f749b35eaab 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.cpp
@@ -10,7 +10,7 @@
#if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor.inl"
#endif /* __ACE_INLINE__ */
#else
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
index 69dde8b966c..da8e9fcce41 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -229,7 +229,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor.inl"
#endif /* __ACE_INLINE__ */
#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
index 9b028ba293b..9b028ba293b 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.inl
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
index 333b49c3ff6..6c2a6f85e0c 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
@@ -6,7 +6,7 @@
#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
index 4c5958cb09e..679656f0cd0 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
@@ -149,7 +149,7 @@ protected:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i"
+#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl"
#endif /* __ACE_INLINE__ */
#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
index 08b866de338..08b866de338 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.inl
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
index 99c51fe77b7..af64c20b061 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -523,7 +523,7 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles ()
TAO_END_VERSIONED_NAMESPACE_DECL
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_Utils.i"
+#include "orbsvcs/Metrics/Metrics_Utils.inl"
#endif /* __ACE_INLINE__ */
#else
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
index 5e0e0ebd36d..20364885350 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
@@ -178,7 +178,7 @@ METRICS_LOGGER_REF); \
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_Utils.i"
+#include "orbsvcs/Metrics/Metrics_Utils.inl"
#endif /* __ACE_INLINE__ */
#endif /* ACE_ENABLE_TIMEPROBES & ACE_COMPILE_TIMEPROBES */
diff --git a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl
index 04a77bddb52..04a77bddb52 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.inl
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
index 1b3377b9f19..caf6a48d3cc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -15,7 +15,7 @@
#include "ace/os_include/os_netdb.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (PortableGroup,
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
index 6c783e885c1..fd3fb4f22cd 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.h
@@ -153,7 +153,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i"
+#include "orbsvcs/PortableGroup/UIPMC_Acceptor.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
index ec296d0f9b6..ec296d0f9b6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
index 056cfd741b6..aa00e113f6f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -16,7 +16,7 @@ ACE_RCSID (tao,
#if !defined (__ACE_INLINE__)
-# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i"
+# include "orbsvcs/PortableGroup/UIPMC_Endpoint.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
index 3c137d6c9ef..39ea02c1caf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -121,7 +121,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i"
+# include "orbsvcs/PortableGroup/UIPMC_Endpoint.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
index 7d91cc4d459..7d91cc4d459 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
index 2f10810d9c9..b7fa81697e3 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -17,7 +17,7 @@
#include "ace/OS_NS_unistd.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
index b7d3cda9069..ced96a1f72e 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h
@@ -300,7 +300,7 @@ public:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl
index 15e9ced25a9..15e9ced25a9 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.inl
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index d0fb3c1c07b..cb28c37c73c 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -13,7 +13,7 @@
#include "ace/OS_NS_unistd.h"
#if !defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl"
#endif /* __ACE_INLINE__ */
#include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
index beb95c8417c..4f2500b8602 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h
@@ -299,7 +299,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i"
+#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl
index 4bf50f13a5b..4bf50f13a5b 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.inl
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 41428c0a1ed..28128f3b310 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -9,7 +9,7 @@
#include "tao/debug.h"
#if !defined(__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
index f8c12442dc3..30eba06951e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -161,7 +161,7 @@ namespace TAO
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined(__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
index 9dd630f54ef..9dd630f54ef 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.inl
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 3d652c1df81..57a6397a818 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -15,7 +15,7 @@
#include "ace/os_include/os_netdb.h"
#if !defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i"
+# include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl"
#endif /* ! __ACE_INLINE__ */
ACE_RCSID (SSLIOP,
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
index 9ce3ba997af..849b5df814c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -193,7 +193,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl"
#endif /* __ACE_INLINE__ */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
index 193fc62f426..193fc62f426 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
index 62061e03009..c2315dbca3c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -14,7 +14,7 @@ ACE_RCSID (SSLIOP,
#if !defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i"
+# include "orbsvcs/SSLIOP/SSLIOP_Endpoint.inl"
#endif /* __ACE_INLINE__ */
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
index d05fec097ad..704db51dc53 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.h
@@ -248,7 +248,7 @@ namespace TAO
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i"
+#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
index 9ea9beb96b6..9ea9beb96b6 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
index 69b1e25ddca..b565b8a6779 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -23,7 +23,7 @@
#include "ace/Null_Mutex.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/DynSched.i"
+#include "orbsvcs/Sched/DynSched.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Sched, DynSched, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
index bae77c581a2..cbb6c142f56 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -535,7 +535,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/DynSched.i"
+#include "orbsvcs/Sched/DynSched.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i b/TAO/orbsvcs/orbsvcs/Sched/DynSched.inl
index 8e27d24c28e..8e27d24c28e 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.inl
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
index 5dc53ae9ffb..4b8755180ca 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -21,7 +21,7 @@
#include "ace/OS_NS_stdio.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/SchedEntry.i"
+#include "orbsvcs/Sched/SchedEntry.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(Sched, SchedEntry, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
index e84ceb6cad3..ddb57c13896 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -639,7 +639,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/SchedEntry.i"
+#include "orbsvcs/Sched/SchedEntry.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl
index 13f00111d67..13f00111d67 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.inl
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 44ebd3e82b3..f8fd77a1709 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -10,7 +10,7 @@
#include "orbsvcs/Scheduler_Factory.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
+#include "orbsvcs/Scheduler_Factory.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(orbsvcs,
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
index f0b9fdf91ab..897086c11c3 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -273,7 +273,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Factory.i"
+#include "orbsvcs/Scheduler_Factory.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
index 2c01870582f..2c01870582f 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
index b2454e5155f..5d703e0e7cf 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Scheduler_Utilities.h"
#if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
+#include "orbsvcs/Scheduler_Utilities.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (orbsvcs,
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
index 6c39123b4f9..c6f5d8fe904 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.h
@@ -61,7 +61,7 @@ public:
};
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Scheduler_Utilities.i"
+#include "orbsvcs/Scheduler_Utilities.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
index ede4dc7780d..ede4dc7780d 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Utilities.inl
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
index 80152580eb5..fbd86f0e669 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -3,7 +3,7 @@
#include "orbsvcs/Time_Utilities.h"
#if !defined (__ACE_INLINE__)
-# include "orbsvcs/Time_Utilities.i"
+# include "orbsvcs/Time_Utilities.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(orbsvcs, Time_Utilities, "$Id$")
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 8a471f31521..5b020f7dcf3 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -104,7 +104,7 @@ private:
TAO_END_VERSIONED_NAMESPACE_DECL
#if defined (__ACE_INLINE__)
-#include "orbsvcs/Time_Utilities.i"
+#include "orbsvcs/Time_Utilities.inl"
#endif /* __ACE_INLINE__ */
#include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.i b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
index f7531f657f3..f7531f657f3 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 1fcb246b5ea..c036ec7bda4 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -20,7 +20,7 @@
#include "ace/os_include/os_ctype.h"
#if !defined (__ACE_INLINE__)
-#include "EC_Mcast.i"
+#include "EC_Mcast.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (EC_Mcast,
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
index a1044cb15aa..19d97e48b72 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -520,7 +520,7 @@ private:
};
#if defined (__ACE_INLINE__)
-#include "EC_Mcast.i"
+#include "EC_Mcast.inl"
#endif /* __ACE_INLINE__ */
#endif /* EC_MCAST_H */
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
index f44811dcd02..f44811dcd02 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.i
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.inl
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index d74d6f76b84..4768e14fb5e 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -23,7 +23,7 @@
#endif
#if !defined (__ACE_INLINE__)
-#include "Driver.i"
+#include "Driver.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(EC_Tests, EC_Driver, "$Id$")
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 31ac5df863e..64994560a36 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -323,7 +323,7 @@ protected:
};
#if defined (__ACE_INLINE__)
-#include "Driver.i"
+#include "Driver.inl"
#endif /* __ACE_INLINE__ */
#endif /* ECT_CONSUMER_H */
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.i b/TAO/orbsvcs/tests/Event/lib/Driver.inl
index f346e7757c1..f346e7757c1 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.i
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.inl
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
index 60146973192..8750ae59899 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp
@@ -8,7 +8,7 @@
#include "tao/Thread_Lane_Resources.h"
#if !defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(BiDirectional, test_i, "$Id$")
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
index d66809ff118..9cf3cb4977c 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h
@@ -86,7 +86,7 @@ private:
};
#if defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
#endif /* TAO_BIDIRECTIONAL_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.i b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
index 799be9fdcbe..799be9fdcbe 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.i
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.inl
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
index f1eff4cd4bb..22b1fd18f1e 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp
@@ -3,7 +3,7 @@
#include "test_i.h"
#if !defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (Send_File,
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
index 10b18e60116..f0c4aa7be58 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h
@@ -43,7 +43,7 @@ private:
};
#if defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
#endif /* TAO_SEND_FILE_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.i b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
index 97524552ff4..97524552ff4 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.i
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.inl
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
index ee3ebd33fa4..5c589569d8d 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp
@@ -4,7 +4,7 @@
#include "tao/debug.h"
#include "ace/OS_NS_unistd.h"
#if !defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID (MT_Server,
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
index e98f9db8850..8982498679c 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h
@@ -65,7 +65,7 @@ private:
};
#if defined(__ACE_INLINE__)
-#include "test_i.i"
+#include "test_i.inl"
#endif /* __ACE_INLINE__ */
#endif /* TAO_MT_SERVER_TEST_I_H */
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl
index 9a32e7ec527..9a32e7ec527 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.i
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.inl