diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-16 14:21:42 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-16 14:21:42 +0000 |
| commit | 7e78ca7626cc7053cb89ce3aa3f234c303b4dd92 (patch) | |
| tree | b4762dc0e92f6c288bad5502be6d149fe8b507f3 | |
| parent | e63697697a82511459e26d09584c3dd353d7fbaf (diff) | |
| download | ATCD-7e78ca7626cc7053cb89ce3aa3f234c303b4dd92.tar.gz | |
ChangeLogTag: Sat Nov 16 08:22:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h | 2 | ||||
| -rw-r--r-- | TAO/tao/Asynch_Queued_Message.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Transport.cpp | 8 |
5 files changed, 18 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ffee74ff092..10cb01200db 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Nov 16 08:22:38 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h: + * orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h: Fixed typos that + lead to link errors. + + * tao/Asynch_Queued_Message.cpp: Fixed a warning in the daily + builds. + Sat Nov 16 12:43:12 UTC 2002 Johnny Willemsen <jwillemsen@remedy.nl> * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.bor: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h index f8a6f33394b..928a37defbe 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h @@ -72,7 +72,7 @@ protected: CORBA::SystemException )); private: - void push (TAO_NS_Event_var &) {} + void push (TAO_NS_Event_var & ns) {TAO_NS_ProxyConsumer::push (ns); } }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h index c0e007839e0..0779e8f7399 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h @@ -77,7 +77,7 @@ protected: CORBA::SystemException )); - void push (TAO_NS_Event_var &); + void push (TAO_NS_Event_var &ns) {TAO_NS_ProxyConsumer::push (ns);} }; #if defined(_MSC_VER) && (_MSC_VER >= 1200) diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index fe0ac5e6fe8..86dab3697b9 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -13,7 +13,7 @@ TAO_Asynch_Queued_Message:: TAO_Asynch_Queued_Message (const ACE_Message_Block *contents, ACE_Allocator *alloc, int is_heap_allocated) - : TAO_Queued_Message (alloc) + : TAO_Queued_Message (alloc, is_heap_allocated) , offset_ (0) { this->size_ = contents->total_length (); diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index aca42baecdb..693156816bf 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -552,7 +552,9 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, TAO_Queued_Message *queued_message = 0; ACE_NEW_RETURN (queued_message, TAO_Asynch_Queued_Message ( - synch_message.current_block ()), + synch_message.current_block (), + 0, + 1), -1); queued_message->push_front (this->head_, this->tail_); } @@ -1225,7 +1227,9 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, TAO_Queued_Message *queued_message = 0; ACE_NEW_RETURN (queued_message, - TAO_Asynch_Queued_Message (message_block), + TAO_Asynch_Queued_Message (message_block, + 0, + 1), -1); queued_message->push_back (this->head_, this->tail_); |