From 25ca5c4cdbd4541c922bd4646ff10aeb434c60d1 Mon Sep 17 00:00:00 2001 From: dengg Date: Fri, 15 Sep 2006 21:31:27 +0000 Subject: Fri Sep 15 21:28:47 UTC 2006 Gan Deng --- CIAO/ChangeLog | 8 ++++++++ .../DomainApplicationManager_Impl.cpp | 10 ---------- CIAO/ciao/Deployment_Core.idl | 11 +---------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index bca0913e401..c1d8b898dab 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Sep 15 21:28:47 UTC 2006 Gan Deng + + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * ciao/Deployment_Core.idl + + Removed the unnecessary event type definition for RTEC since + they are no longer used. + Sun Sep 10 09:20:18 UTC 2006 William R. Otte * tools/Config_Handlers/Utils/XML_Helper.cpp diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index 5445716beb8..a94649239ac 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -1884,16 +1884,6 @@ dump_connections (const ::Deployment::Connections & connections) ACE_DEBUG ((LM_DEBUG, "EventConsumer\n")); break; - case Deployment::rtecEventPublisher: - - ACE_DEBUG ((LM_DEBUG, "rtecEventPublisher\n")); - break; - - case Deployment::rtecEventConsumer: - - ACE_DEBUG ((LM_DEBUG, "rtecEventConsumer\n")); - break; - default: ACE_DEBUG ((LM_DEBUG, "Unknown port kind.\n")); } diff --git a/CIAO/ciao/Deployment_Core.idl b/CIAO/ciao/Deployment_Core.idl index 6f0a465f7e2..56e1c7aceea 100644 --- a/CIAO/ciao/Deployment_Core.idl +++ b/CIAO/ciao/Deployment_Core.idl @@ -70,16 +70,7 @@ module Deployment MultiplexReceptacle, EventEmitter, EventPublisher, - EventConsumer, - ecEventEmitter, - ecEventPublisher, - ecEventConsumer, - rtecEventEmitter, - rtecEventPublisher, - rtecEventConsumer, - nsEventEmitter, - nsEventPublisher, - nsEventConsumer + EventConsumer }; // CIAO's specific type defition. -- cgit v1.2.1