summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple')
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h8
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc4
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h7
-rw-r--r--TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h8
4 files changed, 13 insertions, 14 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index ce523fed960..0c547769e90 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -17,10 +17,10 @@
#ifndef COSECCONSUMER_H_
#define COSECCONSUMER_H_
-#include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "Multiple.h"
class Consumer : public POA_CosEventComm::PushConsumer, public Multiple
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
index 3018aa6b8df..ee8fe174725 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/CosEC_RtEC_Based_Mult.mpc
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Cons) : orbsvcsexe, event, rtevent, rtsched {
after += CosEC_RtEC_Based_lib
includes += ../../lib
libs += CosEC_RtEC_Based
@@ -12,7 +12,7 @@ project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
}
}
-project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched {
+project(*Supp) : orbsvcsexe, event, rtevent, rtsched {
after += CosEC_RtEC_Based_lib
includes += ../../lib
libs += CosEC_RtEC_Based
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index 3248946ce78..883c5d20dcf 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -17,10 +17,9 @@
#ifndef COSECMULTIPLE_H
#define COSECMULTIPLE_H
-#include "orbsvcs/Naming/Naming_Client.h"
-#include "orbsvcs/Naming/Naming_Server.h"
-#include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Utils.h"
+#include "orbsvcs/orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
class Multiple
{
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 29b213cd31f..bcc3bf9f145 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -17,10 +17,10 @@
#ifndef COSECSUPPLIER_H_
#define COSECSUPPLIER_H_
-#include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
+#include "orbsvcs/orbsvcs/CosEventCommC.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminC.h"
+#include "orbsvcs/orbsvcs/CosEventCommS.h"
+#include "orbsvcs/orbsvcs/CosEventChannelAdminS.h"
#include "Multiple.h"
class Supplier : public POA_CosEventComm::PushSupplier,