summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/performance-tests/RTEvent/lib
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/performance-tests/RTEvent/lib')
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp8
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp10
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp4
29 files changed, 87 insertions, 41 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
index 4c06d23febc..7daaf4ae6b4 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp
@@ -13,7 +13,9 @@
#include "Client_Group.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Client_Group, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Client_Group,
+ "$Id$")
void
Client_Group::init (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
index c3d112526fd..9f32c911ff2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp
@@ -13,7 +13,9 @@
#include "Client_Pair.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Client_Pair, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Client_Pair,
+ "$Id$")
void
Client_Pair::init (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 989e98510b2..63ff884f656 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -8,10 +8,12 @@
#include "Consumer.h"
#include "Implicit_Deactivator.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/OS_NS_unistd.h"
-ACE_RCSID(TAO_PERF_RTEC, Consumer, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Consumer,
+ "$Id$")
Consumer::Consumer (CORBA::Long experiment_id,
CORBA::Long event_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index 9a982381130..fb105da7511 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
@@ -9,8 +9,8 @@
#define TAO_PERF_RTEC_CONSUMER_H
#include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#include "ace/Sample_History.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
index 1d721d1f04d..3b5b84d224d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -12,14 +12,16 @@
#include "Auto_Functor.h"
#include "Auto_Disconnect.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
#include "ace/High_Res_Timer.h"
#include "ace/Sample_History.h"
#include "ace/Basic_Stats.h"
#include "ace/Auto_Ptr.h"
-ACE_RCSID (TAO_RTEC_Perf, Control, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf,
+ Control,
+ "$Id$")
Control::Control (size_t peers_expected,
size_t iterations,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
index 0b5c98dee66..220c8c3957c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp
@@ -12,7 +12,9 @@
#include "EC_Destroyer.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, EC_Destroyer, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ EC_Destroyer,
+ "$Id$")
EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec)
: ec_ (RtecEventChannelAdmin::EventChannel::_duplicate (ec))
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
index d974b324e85..314a668cc30 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp
@@ -10,7 +10,9 @@
#include "Auto_Disconnect.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_RTEC_Perf, Loopback, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf,
+ Loopback,
+ "$Id$")
Loopback::Loopback (CORBA::Long experiment_id,
CORBA::Long base_event_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index 314cf22f3ff..cb7693306f9 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -8,9 +8,11 @@
#include "Loopback_Consumer.h"
#include "Implicit_Deactivator.h"
-#include "orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
-ACE_RCSID(PERF_RTEC, Loopback_Consumer, "$Id$")
+ACE_RCSID (PERF_RTEC,
+ Loopback_Consumer,
+ "$Id$")
Loopback_Consumer::
Loopback_Consumer (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index b3e05ea1c10..ba25bc40a16 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
@@ -10,8 +10,8 @@
#include "Loopback_Supplier.h"
#include "tao/Utils/Servant_Var.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
index 31d321f45c8..5a0c80aed0c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp
@@ -13,7 +13,9 @@
#include "Loopback_Pair.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Loopback_Pair, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Loopback_Pair,
+ "$Id$")
void
Loopback_Pair::init (CORBA::Long experiment_id,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
index 7bdb98d3fad..1e516958c44 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp
@@ -9,7 +9,9 @@
#include "Loopback_Supplier.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_PERF_RTEC, Loopback_Supplier, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Loopback_Supplier,
+ "$Id$")
Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id,
CORBA::Long response_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 084c2bd1341..75bfd1cb88f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
@@ -10,8 +10,8 @@
#define TAO_RTEC_LOOPBACK_SUPPLIER_H
#include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
index 2e4014a4abc..a2ee9263b1f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp
@@ -12,7 +12,9 @@
#include "ORB_Holder.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Holder, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Holder,
+ "$Id$")
ORB_Holder::ORB_Holder (int &argc, char *argv[],
const char *orb_id
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
index 8bb8641e37c..2071b0a718e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.cpp
@@ -11,4 +11,6 @@
#include "ORB_Shutdown.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Shutdown, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Shutdown,
+ "$Id$")
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
index 0a7b8bc11d1..92b8dce40c6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp
@@ -12,7 +12,9 @@
#include "ORB_Task.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Task, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Task,
+ "$Id$")
ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
: orb_ (CORBA::ORB::_duplicate (orb))
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
index bbbdfaf530c..fe7f8de472c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp
@@ -12,7 +12,9 @@
#include "ORB_Task_Activator.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, ORB_Task_Activator, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ ORB_Task_Activator,
+ "$Id$")
ORB_Task_Activator::~ORB_Task_Activator (void)
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 6ba6924c48b..906dacdfdcd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -15,10 +15,12 @@
#include "Auto_Disconnect.h"
#include "Loopback.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
-ACE_RCSID (TAO_RTEC_Perf, Peer_Base, "$Id$")
+ACE_RCSID (TAO_RTEC_Perf,
+ Peer_Base,
+ "$Id$")
Peer_Base::Peer_Base (CORBA::ORB_ptr orb,
RTServer_Setup &rtserver_setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index 3733441998b..aaed29be88d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
@@ -11,7 +11,7 @@
#define TAO_RTEC_PERF_PEER_BASE_H
#include "Federated_TestS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
index 6ef03eec91f..bbb980bde7b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp
@@ -14,7 +14,9 @@
#include "PriorityBand_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, PriorityBand_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ PriorityBand_Setup,
+ "$Id$")
PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb,
const RTCORBA_Setup &rtcorba_setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
index 29d8ceb304a..b5c6d99ae37 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp
@@ -16,7 +16,9 @@
#include "RTCORBA_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTCORBA_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTCORBA_Setup,
+ "$Id$")
RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb,
const RT_Class &rtclass,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
index 21e0f13b0bb..6e3d06125f6 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp
@@ -16,7 +16,9 @@
#include "RTClient_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTClient_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTClient_Setup,
+ "$Id$")
RTClient_Setup::RTClient_Setup (int use_rt_corba,
CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index 4929d57a20f..f5516c30508 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -9,13 +9,15 @@
#include "RTEC_Initializer.h"
#include "RTCORBA_Setup.h"
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
-#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h"
#include "ace/Dynamic_Service.h"
-ACE_RCSID(TAO_PERF_RTEC, RTEC_Initializer, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTEC_Initializer,
+ "$Id$")
TAO_EC_Event_Channel *
RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
index 2e96154abf0..fdaaee06d30 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp
@@ -17,7 +17,9 @@
#include "RTPOA_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTPOA_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTPOA_Setup,
+ "$Id$")
RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb,
const RTCORBA_Setup &rtcorba_setup
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
index c37b85c196a..609f8f7b314 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp
@@ -16,7 +16,9 @@
#include "RTServer_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, RTServer_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ RTServer_Setup,
+ "$Id$")
RTServer_Setup::RTServer_Setup (int use_rt_corba,
CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 4e4260a89f9..096d2f09cbd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
@@ -8,7 +8,7 @@
#include "Send_Task.h"
-#include "orbsvcs/Time_Utilities.h"
+#include "orbsvcs/orbsvcs/Time_Utilities.h"
#include "ace/Barrier.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
index b6ae6a906f9..04111b2b80c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task_Stopper.cpp
@@ -12,7 +12,9 @@
#include "Send_Task_Stopper.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, Send_Task_Stopper, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Send_Task_Stopper,
+ "$Id$")
Send_Task_Stopper::~Send_Task_Stopper (void)
{
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
index d6c3307dc82..11c14e80232 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp
@@ -9,7 +9,9 @@
#include "Supplier.h"
#include "Implicit_Deactivator.h"
-ACE_RCSID(TAO_PERF_RTEC, Supplier, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ Supplier,
+ "$Id$")
Supplier::Supplier (CORBA::Long experiment_id,
CORBA::Long event_type,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index 6a04b5f7049..cc3878a8be1 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
@@ -10,8 +10,8 @@
#define TAO_PERF_RTEC_SUPPLIER_H
#include "rtec_perf_export.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index 062159545b6..594837f3152 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -13,7 +13,9 @@
#include "SyncScope_Setup.inl"
#endif /* __ACE_INLINE__ */
-ACE_RCSID(TAO_PERF_RTEC, SyncScope_Setup, "$Id$")
+ACE_RCSID (TAO_PERF_RTEC,
+ SyncScope_Setup,
+ "$Id$")
SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
Messaging::SyncScope value