diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-07-16 02:11:35 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-07-16 02:11:35 +0000 |
| commit | 85b45e42fac58396ea1f282d72f93f3c8965380f (patch) | |
| tree | 6e9b99f1554f53fdde27e2578919872ca9c5f054 | |
| parent | 7d9fd14c88b814913534f9ebdf7c966883bb5899 (diff) | |
| download | ATCD-85b45e42fac58396ea1f282d72f93f3c8965380f.tar.gz | |
ChangeLogTag:Mon Jul 15 21:23:47 2002 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 10 | ||||
| -rw-r--r-- | ace/Message_Block.i | 36 |
3 files changed, 32 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog index caa5bd3ea8e..377ec3ec8e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 15 21:23:47 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Message_Block.i (base): Fixed a warning in TRU 64 builds. + Mon Jul 15 18:56:47 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/String_Base.cpp (substring): Changed "nil" to "nill" to @@ -57,7 +61,7 @@ Mon Jul 15 10:14:44 2002 Carlos O'Ryan <coryan@atdesk.com> Sun Jul 14 20:14:16 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - * FAQ: Fixed the use of "*.ps.gz" files. Thanks to + * FAQ: Fixed the use of "*.ps.gz" files. Thanks to Carol Hunsicker <carol.hunsicker@lmco.com> for pointing this out. @@ -70,12 +74,12 @@ Sun Jul 14 01:43:32 2002 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Message_Block.h: * ace/Message_Block.i: Added two methods viz. reset_allocators () - and access_allocators () to ACE_Message_Block. + and access_allocators () to ACE_Message_Block. Sat Jul 13 17:29:35 2002 Balachandran Natarajan <bala@cs.wustl.edu> * bin/fuzz.pl: Removed the word "warning" from a print statement, - since our scoreboard scripts seems to catch that as a warning. + since our scoreboard scripts seems to catch that as a warning. Sat Jul 13 13:31:54 2002 Balachandran Natarajan <bala@cs.wustl.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index caa5bd3ea8e..377ec3ec8e4 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,7 @@ +Mon Jul 15 21:23:47 2002 Balachandran Natarajan <bala@cs.wustl.edu> + + * ace/Message_Block.i (base): Fixed a warning in TRU 64 builds. + Mon Jul 15 18:56:47 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/String_Base.cpp (substring): Changed "nil" to "nill" to @@ -57,7 +61,7 @@ Mon Jul 15 10:14:44 2002 Carlos O'Ryan <coryan@atdesk.com> Sun Jul 14 20:14:16 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> - * FAQ: Fixed the use of "*.ps.gz" files. Thanks to + * FAQ: Fixed the use of "*.ps.gz" files. Thanks to Carol Hunsicker <carol.hunsicker@lmco.com> for pointing this out. @@ -70,12 +74,12 @@ Sun Jul 14 01:43:32 2002 Balachandran Natarajan <bala@cs.wustl.edu> * ace/Message_Block.h: * ace/Message_Block.i: Added two methods viz. reset_allocators () - and access_allocators () to ACE_Message_Block. + and access_allocators () to ACE_Message_Block. Sat Jul 13 17:29:35 2002 Balachandran Natarajan <bala@cs.wustl.edu> * bin/fuzz.pl: Removed the word "warning" from a print statement, - since our scoreboard scripts seems to catch that as a warning. + since our scoreboard scripts seems to catch that as a warning. Sat Jul 13 13:31:54 2002 Balachandran Natarajan <bala@cs.wustl.edu> diff --git a/ace/Message_Block.i b/ace/Message_Block.i index 7bb046b3f0d..01d11f795e0 100644 --- a/ace/Message_Block.i +++ b/ace/Message_Block.i @@ -283,24 +283,6 @@ ACE_Message_Block::access_allocators (ACE_Allocator *& allocator_strategy, this->message_block_allocator_; } -ACE_INLINE void -ACE_Message_Block::reset_allocators (ACE_Allocator *allocator_strategy, - ACE_Allocator *data_block_allocator, - ACE_Allocator *message_block_allocator) -{ - this->data_block_->allocator_strategy_ = - allocator_strategy; - this->data_block_->data_block_allocator_ = - data_block_allocator; - this->message_block_allocator_ = - message_block_allocator; - - if (this->cont () != 0) - this->cont ()->reset_allocators (allocator_strategy, - data_block_allocator, - message_block_allocator); -} - ACE_INLINE char * ACE_Message_Block::base (void) const { @@ -440,6 +422,24 @@ ACE_Message_Block::cont (void) const } ACE_INLINE void +ACE_Message_Block::reset_allocators (ACE_Allocator *allocator_strategy, + ACE_Allocator *data_block_allocator, + ACE_Allocator *message_block_allocator) +{ + this->data_block_->allocator_strategy_ = + allocator_strategy; + this->data_block_->data_block_allocator_ = + data_block_allocator; + this->message_block_allocator_ = + message_block_allocator; + + if (this->cont () != 0) + this->cont ()->reset_allocators (allocator_strategy, + data_block_allocator, + message_block_allocator); +} + +ACE_INLINE void ACE_Message_Block::next (ACE_Message_Block *next_msg) { ACE_TRACE ("ACE_Message_Block::next"); |