diff options
| author | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-13 17:49:52 +0000 |
|---|---|---|
| committer | dengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-13 17:49:52 +0000 |
| commit | 34efc9984312d786709b4907e0d5cc729079c45b (patch) | |
| tree | c75658b1a41477e778655f4debb9ad8268c241a9 | |
| parent | 67bf0bdfae03d121093a7fb126df39d446a8c403 (diff) | |
| download | ATCD-34efc9984312d786709b4907e0d5cc729079c45b.tar.gz | |
Fixed some compilation errors and a bug in non-QoS settings for consumers.
5 files changed, 12 insertions, 9 deletions
diff --git a/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/DAnCE/NodeApplication/NodeApplication_Impl.cpp index be10f420434..25d3f67129e 100644 --- a/DAnCE/NodeApplication/NodeApplication_Impl.cpp +++ b/DAnCE/NodeApplication/NodeApplication_Impl.cpp @@ -655,7 +655,6 @@ ACE_THROW_SPEC ((::CORBA::SystemException, es_infos[i].receivers[j].addr_serv_id.in (), es_infos[i].receivers[j].is_multicast, es_infos[i].receivers[j].listen_port); - } CORBA::ULong curr_len = retv->length (); diff --git a/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp index 919ca0ab599..1141de73920 100644 --- a/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp +++ b/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp @@ -185,9 +185,12 @@ namespace CIAO if (qos->dependencies.length () == 0) { qos->dependencies.length (1); - qos->dependencies[0].event.header.type = ACE_ES_DISJUNCTION_DESIGNATOR; + qos->dependencies[0].event.header.type = ACE_ES_EVENT_ANY; qos->dependencies[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; qos->dependencies[0].rt_info = 0; + + ACE_DEBUG ((LM_DEBUG, "\n======== Normalized ConsumerQoS length is: %d\n\n", + qos->dependencies.length ())); } proxy_supplier->connect_push_consumer (push_consumer.in (), diff --git a/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h index e932ac3a8bb..7544bf39201 100644 --- a/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h +++ b/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h @@ -49,7 +49,8 @@ namespace CIAO * first time initialized. */ class CIAO_RTEVENT_Export RTEventService : - public virtual EventServiceBase + public virtual EventServiceBase, + public virtual POA_CIAO::CIAO_RT_Event_Service { public: diff --git a/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp b/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp index b2c75e78c02..c8e5ec022b4 100644 --- a/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp +++ b/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp @@ -153,7 +153,7 @@ <name>hello_event_ec_publisher_connection</name> <internalEndpoint> <portName>click_out</portName> - <kind>rtecEventPublisher</kind> + <kind>EventPublisher</kind> <instance>Hello-Sender-idd</instance> </internalEndpoint> <externalReference> @@ -165,7 +165,7 @@ <name>hello_event_ec_consumer_connection</name> <internalEndpoint> <portName>click_in</portName> - <kind>rtecEventConsumer</kind> + <kind>EventConsumer</kind> <instance>Hello-Receiver-idd</instance> </internalEndpoint> <externalReference> diff --git a/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp index 6c265bea2a5..114081d5b8b 100644 --- a/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp +++ b/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp @@ -62,16 +62,16 @@ namespace CIAO switch (i->type ().integral ()) { case ::CIAO::Config_Handlers::EventServiceType::EC_l: - a_esd.type = CIAO::DAnCE::EC; + a_esd.type = CIAO::EC; break; case ::CIAO::Config_Handlers::EventServiceType::NOTIFY_l: - a_esd.type = CIAO::DAnCE::NOTIFY; + a_esd.type = CIAO::NOTIFY; break; case ::CIAO::Config_Handlers::EventServiceType::RTEC_l: - a_esd.type = CIAO::DAnCE::RTEC; + a_esd.type = CIAO::RTEC; break; case ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY_l: - a_esd.type = CIAO::DAnCE::RTNOTIFY; + a_esd.type = CIAO::RTNOTIFY; break; default: ACE_ERROR ((LM_ERROR, |