diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-01-03 16:47:52 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-01-03 16:47:52 +0000 |
| commit | fda8686726e07c369978f9f5068cde3454d88dfa (patch) | |
| tree | 59863627b3a084a420f222968120be73c3cb3dcb | |
| parent | e3fdaa39109ce004a9e04822d9f30743e3f7cf16 (diff) | |
| download | ATCD-fda8686726e07c369978f9f5068cde3454d88dfa.tar.gz | |
ChangeLogTag: Mon Jan 03 10:46:31 2000 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 13 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp | 44 |
2 files changed, 32 insertions, 25 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 4b87da6386f..a37ef7139b9 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,8 +1,15 @@ +Mon Jan 03 10:46:31 2000 David L. Levine <levine@cs.wustl.edu> + + * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp (next_n): + modified look index so that its comparison is > 0, not + >= 0. Now that it's unsigned, it was causing a compiler + warning. + Sun Jan 02 10:48:59 2000 Michael Kircher <Michael.Kircher@mchp.siemens.de> - * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp: - Fixed a MSVC warning, complaining about an array - operator. + * orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp: + Fixed a MSVC warning, complaining about an array + operator. Sat Jan 01 09:18:59 2000 David L. Levine <levine@cs.wustl.edu> diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index ee969c2994c..4be0bf71545 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -161,8 +161,8 @@ TAO_Offer_Iterator_Collection::next_n (CORBA::ULong n, // Merge it with the passed set. offset = offers->length (); offers->length (out_offers->length () + offset); - for (CORBA::ULong j = out_offers->length () - 1; j >= 0; j--) - offers[j + offset] = out_offers[j]; + for (CORBA::ULong j = out_offers->length (); j > 0; j--) + offers[j + offset - 1] = out_offers[j - 1]; offers_left -= out_offers->length (); } @@ -279,29 +279,29 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, { // Allocate space for the returned OfferIds. CosTrading::OfferId* id_buf = - CosTrading::OfferIdSeq::allocbuf (returnable_items); + CosTrading::OfferIdSeq::allocbuf (returnable_items); if (id_buf != 0) - { - // Copy in those ids! - for (int i = 0; i < returnable_items; i++) - { - CosTrading::OfferId offer_id = 0; - - this->ids_.dequeue_head (offer_id); - id_buf[i] = offer_id; - } - - // Place them into an OfferIdSeq. - ACE_NEW_RETURN (_ids, - CosTrading::OfferIdSeq (returnable_items, - returnable_items, - id_buf, - 1), - return_value); - } + { + // Copy in those ids! + for (int i = 0; i < returnable_items; i++) + { + CosTrading::OfferId offer_id = 0; + + this->ids_.dequeue_head (offer_id); + id_buf[i] = offer_id; + } + + // Place them into an OfferIdSeq. + ACE_NEW_RETURN (_ids, + CosTrading::OfferIdSeq (returnable_items, + returnable_items, + id_buf, + 1), + return_value); + } else - ACE_NEW_RETURN (_ids, + ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq, return_value); } |