diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-25 14:52:02 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-25 14:52:02 +0000 |
commit | d65fbd5b0e1adfb6186d2dc1fbf55b72aacebee1 (patch) | |
tree | c5e18ec1fe6af8046389ac73f1ed97de52571e88 | |
parent | 85615ad76a1064691d7c1e68bc1276570ae708f1 (diff) | |
download | ATCD-d65fbd5b0e1adfb6186d2dc1fbf55b72aacebee1.tar.gz |
ChangeLogTag: Fri Oct 25 09:49:31 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu>
-rw-r--r-- | TAO/ChangeLog | 7 | ||||
-rw-r--r-- | TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp | 30 |
2 files changed, 23 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6ce92918d7f..0b3b6d520e2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Fri Oct 25 09:49:31 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + + * examples/OBV/Typed_Events/Event_Types_impl.cpp: + + Added missing .in() in an assignment of _var class contents to a pointer, + and 'this->' in several places where a member variable is referenced. + Thu Oct 24 19:48:21 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * Re-did this after the great reversion "Wed Oct 23 16:32:36 2002 diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index dbc3fd4b4ff..712f405870f 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -247,13 +247,13 @@ Event_List_Link_factory::create_for_unmarshal () // Event_List implementation =================================== -Event_List_impl::Event_List_impl () +Event_List_impl::Event_List_impl (void) { this->first_link (0); - last_link_cache_ = 0; + this->last_link_cache_ = 0; } -Event_List_impl::~Event_List_impl () +Event_List_impl::~Event_List_impl (void) { // Destructor does nothing explicit, because the _var types do care. } @@ -265,8 +265,10 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) // guard against the access to the list from another thread. // But this is omitted in this example. - Event_List_Link_var new_link (ACE_static_cast(Event_List_Link*, - new Event_List_Link_impl (e))); + Event_List_Link_impl *new_link_impl = 0; + ACE_NEW (new_link_impl, + Event_List_Link_impl (e)); + Event_List_Link_var new_link = new_link_impl; // We need a new link to store the reference to the event e. // But if we'd had assigned the newly created instance directly through @@ -275,36 +277,36 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) // increased, but the modifier does. - if (last_link_cache_ == 0) + if (this->last_link_cache_ == 0) { // Search the end. for (Event_List_Link *i = this->first_link (); i != 0; i = i->get_next_link ()) { - last_link_cache_ = i; + this->last_link_cache_ = i; } } // If still null then the list is empty. - if (last_link_cache_ == 0) + if (this->last_link_cache_ == 0) { this->first_link (new_link); } else { - last_link_cache_->attach_next_link (new_link); - last_link_cache_ = new_link; + this->last_link_cache_->attach_next_link (new_link); + this->last_link_cache_ = new_link.in (); } } -Event_List_factory::~Event_List_factory () +Event_List_factory::~Event_List_factory (void) { } TAO_OBV_CREATE_RETURN_TYPE (Event_List) -Event_List_factory::create_for_unmarshal () +Event_List_factory::create_for_unmarshal (void) { return new Event_List_impl; } @@ -315,12 +317,12 @@ Event_List_Iterator::Event_List_Iterator (Event_List *list) this->init (list); } -Event_List_Iterator::Event_List_Iterator () +Event_List_Iterator::Event_List_Iterator (void) { // current_ is a _var and set itself to null. } -Event_List_Iterator::~Event_List_Iterator () +Event_List_Iterator::~Event_List_Iterator (void) { // nothing } |