summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/performance-tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h2
-rw-r--r--TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp4
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp6
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp2
-rw-r--r--TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h4
16 files changed, 25 insertions, 25 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index e043721e26d..68953a71771 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -1,8 +1,8 @@
#include "ORBInitializer.h"
#include "ServerRequestInterceptor.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingC.h"
+#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
+#include "orbsvcs/CosLoadBalancingC.h"
#include "tao/ORB_Constants.h"
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
index 773e034dace..d089c75ee9e 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
index 9eb4bbd955f..3e2bd11f9b2 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h
@@ -16,7 +16,7 @@
#include /**/ "ace/pre.h"
-#include "orbsvcs/orbsvcs/CosLoadBalancingS.h"
+#include "orbsvcs/CosLoadBalancingS.h"
# if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index c61cd9640f8..b07d2c9add2 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -9,8 +9,8 @@
#include "ORB_Task.h"
#include "ORB_Task_Activator.h"
-#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
#include "tao/PortableServer/PortableServer.h"
#include "tao/RTPortableServer/RTPortableServer.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
index 63ff884f656..5fc7489897e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp
@@ -8,7 +8,7 @@
#include "Consumer.h"
#include "Implicit_Deactivator.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
#include "ace/OS_NS_unistd.h"
ACE_RCSID (TAO_PERF_RTEC,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h
index fb105da7511..9a982381130 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/orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventCommS.h"
+#include "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 86f846853d5..b35d809551c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp
@@ -11,7 +11,7 @@
#include "Shutdown.h"
#include "Auto_Disconnect.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
#include "ace/High_Res_Timer.h"
#include "ace/Sample_History.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
index 1c160b0370d..0c622a996a8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.h
@@ -10,7 +10,7 @@
#define TAO_PERF_RTEC_EC_DESTROYER_H
#include "rtec_perf_export.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
index cb7693306f9..2c3d1f8084e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp
@@ -8,7 +8,7 @@
#include "Loopback_Consumer.h"
#include "Implicit_Deactivator.h"
-#include "orbsvcs/orbsvcs/Event_Service_Constants.h"
+#include "orbsvcs/Event_Service_Constants.h"
ACE_RCSID (PERF_RTEC,
Loopback_Consumer,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h
index ba25bc40a16..b3e05ea1c10 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/orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h
index 75bfd1cb88f..084c2bd1341 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/orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
index 906dacdfdcd..74741e0f8be 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp
@@ -15,8 +15,8 @@
#include "Auto_Disconnect.h"
#include "Loopback.h"
-#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/Event/EC_Gateway_IIOP.h"
ACE_RCSID (TAO_RTEC_Perf,
Peer_Base,
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h
index aaed29be88d..3733441998b 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/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
index f5516c30508..408b52b3557 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp
@@ -9,9 +9,9 @@
#include "RTEC_Initializer.h"
#include "RTCORBA_Setup.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 "orbsvcs/Event/EC_Event_Channel.h"
+#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
#include "ace/Dynamic_Service.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp
index 096d2f09cbd..4e4260a89f9 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/orbsvcs/Time_Utilities.h"
+#include "orbsvcs/Time_Utilities.h"
#include "ace/Barrier.h"
#include "ace/OS_NS_unistd.h"
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h
index cc3878a8be1..6a04b5f7049 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/orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/orbsvcs/RtecEventChannelAdminC.h"
+#include "orbsvcs/RtecEventCommS.h"
+#include "orbsvcs/RtecEventChannelAdminC.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once