diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-12-06 18:41:28 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-12-06 18:41:28 +0000 |
| commit | 7c2679c76249ca4300fb3ea08f2b7256f8d1aa8b (patch) | |
| tree | c849ca31bcdfd811e82534558b1bec035f86b9da /TAO | |
| parent | 3a015a05192ffb619aca4bada24077fbcef3f8a5 (diff) | |
| download | ATCD-7c2679c76249ca4300fb3ea08f2b7256f8d1aa8b.tar.gz | |
ChangeLogTag:Sat Dec 6 12:37:48 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO')
5 files changed, 17 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 984e3d0b459..e70a4af01e6 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Sat Dec 6 12:37:48 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp: + * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h: + + Changed the names of enum declarations "NONE" in these + files. This was causing a clash with VxWORKS systems + headers. Thanks to Thomas Lockhart for providing the patches. + Sat Dec 6 18:25:01 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl> * performance-tests/Latency/DII/client.dsp: diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp index 34741f6cef0..d768218a862 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp @@ -39,7 +39,7 @@ void setup_object_group(TAO_FTEC_Event_Channel* es, FtRtecEventChannelAdmin::EventChannel_ptr ec ACE_ENV_ARG_DECL) { - if (membership != TAO_FTEC_Event_Channel::NONE) {// register to naming service + if (membership != TAO_FTEC_Event_Channel::UNSPECIFIED) {// register to naming service FTRT::ManagerInfoList member_list; member_list.length(1); member_list[0].the_location = Fault_Detector::instance()->my_location(); diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h index 3fc9d46a9c1..ff7d20f47ff 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h @@ -34,7 +34,7 @@ public: ~TAO_FTEC_Event_Channel(); enum MEMBERSHIP { - NONE, + UNSPECIFIED, PRIMARY, BACKUP }; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp index d739b530ca6..f09e05f8428 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp @@ -13,7 +13,7 @@ #include "tao/Any_Unknown_IDL_Type.h" TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void) - : implicit_id_ (NONE) + : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY) { (void) this->implicit_ids_.bind (ACE_CString ("filterable_data", 0, @@ -699,7 +699,7 @@ TAO_Notify_Constraint_Visitor::visit_component ( if (this->implicit_ids_.find (component_name, this->implicit_id_) != 0) { - this->implicit_id_ = NONE; + this->implicit_id_ = TAO_Notify_Constraint_Visitor::EMPTY; } // If this component has no sub-component, only an identifier, @@ -711,7 +711,7 @@ TAO_Notify_Constraint_Visitor::visit_component ( // matches one of the nested field names in // CosNotification::StructuredEvent, we just visit the nested // component, if any. - if (this->implicit_id_ == NONE) + if (this->implicit_id_ == TAO_Notify_Constraint_Visitor::EMPTY) { if (nested == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h index c9b60ee4836..bea7eb79521 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h @@ -106,7 +106,7 @@ protected: EVENT_NAME, VARIABLE_HEADER, REMAINDER_OF_BODY, - NONE + EMPTY }; /// Storage for the type of implicit id the component has (if any). |