diff options
| author | Chris Cleeland <chris.cleeland@gmail.com> | 2005-11-23 15:21:57 +0000 |
|---|---|---|
| committer | Chris Cleeland <chris.cleeland@gmail.com> | 2005-11-23 15:21:57 +0000 |
| commit | b676d79a7bb4b26a7c5d12af9bca143049b0fa47 (patch) | |
| tree | bd88a572aed118ef248a05ff530ee4b26d9db4da | |
| parent | 09d0518865daba5a0d08b88bd2bf004e1c9d2ba9 (diff) | |
| download | ATCD-b676d79a7bb4b26a7c5d12af9bca143049b0fa47.tar.gz | |
Wed Nov 23 09:20:03 2005 Chris Cleeland <cleeland_c@ociweb.com>
Fixups that broke builds with ACE_LACKS_DEPRECATED_MACROS.
| -rw-r--r-- | TAO/ChangeLog | 11 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp | 18 |
3 files changed, 24 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 5b21a3243fa..3ed0e88b4c8 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Nov 23 09:20:03 2005 Chris Cleeland <cleeland_c@ociweb.com> + + Fix a few things I should have caught in the Great Merge, but + missed. + + * orbsvcs/orbsvcs/Notify/Consumer.cpp (dispatch_request): Change + from using deprecated TAO_DEFAULT_MINOR_CODE to TAO::VMCID. + + * orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp: Use + real C++ static_cast<> rather than deprecated ACE_static_cast(). + Wed Nov 23 14:53:09 UTC 2005 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc: diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp index 4d526c5fff0..a7e45f8c959 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp @@ -402,7 +402,7 @@ TAO_Notify_Consumer::dispatch_batch (const CosNotification::EventBatch& batch) } break; - case TAO_DEFAULT_MINOR_CODE: + case TAO::VMCID: default: switch (ex.minor () & BITS_5_THRU_12_MASK) { diff --git a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp index eb1a63347ff..5c7947f120a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp @@ -129,7 +129,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), request->sequence ())); + static_cast <int> (this->proxy ()->id ()), + request->sequence ())); requests.enqueue_head (request); result = false; } @@ -137,7 +138,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), request->sequence ())); + static_cast<int> (this->proxy ()->id ()), + request->sequence ())); request->complete (); request->release (); } @@ -148,7 +150,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), request->sequence ())); + static_cast<int> (this->proxy ()->id ()), + request->sequence ())); requests.enqueue_head (request); result = false; } @@ -156,7 +159,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), request->sequence ())); + static_cast<int> (this->proxy ()->id ()), + request->sequence ())); request->complete (); request->release (); } @@ -187,7 +191,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Will retry %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), request->sequence ())); + static_cast<int> (this->proxy ()->id ()), + request->sequence ())); requests.enqueue_head (request); result = false; } @@ -195,7 +200,8 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A { if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Consumer %d: Discarding %d\n"), - ACE_static_cast (int, this->proxy ()->id ()), request->sequence ())); + static_cast<int> (this->proxy ()->id ()), + request->sequence ())); request->complete (); request->release (); } |