diff options
| author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-04 00:00:20 +0000 |
|---|---|---|
| committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-02-04 00:00:20 +0000 |
| commit | 9db10a4b9155eb7995e0d6a87627a79688ad967f (patch) | |
| tree | bf2c234a1c9ce64e3da05faa155f168668dc2bd5 | |
| parent | bd365ebed16cd67a91e942bc0903bb131456219a (diff) | |
| download | ATCD-9db10a4b9155eb7995e0d6a87627a79688ad967f.tar.gz | |
ChangeLogTag:Sat Feb 3 15:56:43 2001 Darrell Brunsch <brunsch@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp | 24 |
2 files changed, 19 insertions, 12 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index b4417ea8785..554b96d5833 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Sat Feb 3 15:56:43 2001 Darrell Brunsch <brunsch@uci.edu> + + * orbsvcs/orbsvcs/AV/AVStreams_i.cpp: + + Renamed some variables to remove multiply defined variables + on MSVC, which resulted from different for loop scoping rules. + Fri Feb 2 14:45:57 2001 Frank Hunleth <fhunleth@cs.wustl.edu> * orbsvcs/ImplRepo_Service/NT_Service.h: diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index c58d2739960..be5c00316c3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -1872,10 +1872,10 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec, for (u_int i=0;i<flow_spec.length ();i++) { TAO_AV_FlowSpecSetItor end = this->forward_flow_spec_set.end (); - for (TAO_AV_FlowSpecSetItor begin = this->forward_flow_spec_set.begin (); - begin != end; ++begin) + for (TAO_AV_FlowSpecSetItor forward_begin = this->forward_flow_spec_set.begin (); + forward_begin != end; ++forward_begin) { - TAO_FlowSpec_Entry *entry = *begin; + TAO_FlowSpec_Entry *entry = *forward_begin; if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0) { // entry->protocol_object ()->start (); @@ -1885,10 +1885,10 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec, } end = this->forward_flow_spec_set.end (); - for (TAO_AV_FlowSpecSetItor begin = this->reverse_flow_spec_set.begin (); - begin != end; ++begin) + for (TAO_AV_FlowSpecSetItor reverse_begin = this->reverse_flow_spec_set.begin (); + reverse_begin != end; ++reverse_begin) { - TAO_FlowSpec_Entry *entry = *begin; + TAO_FlowSpec_Entry *entry = *reverse_begin; if (ACE_OS::strcmp (entry->flowname (), flow_spec [i]) == 0) { // entry->protocol_object ()->start (); @@ -1901,20 +1901,20 @@ TAO_StreamEndPoint::start (const AVStreams::flowSpec &flow_spec, else { TAO_AV_FlowSpecSetItor end = this->forward_flow_spec_set.end (); - for (TAO_AV_FlowSpecSetItor begin = this->forward_flow_spec_set.begin (); - begin != end; ++begin) + for (TAO_AV_FlowSpecSetItor forwardbegin = this->forward_flow_spec_set.begin (); + forwardbegin != end; ++forwardbegin) { - TAO_FlowSpec_Entry *entry = *begin; + TAO_FlowSpec_Entry *entry = *forwardbegin; // entry->protocol_object ()->start (); if (entry->handler () != 0) entry->handler ()->start (entry->role ()); } end = this->reverse_flow_spec_set.end (); - for (TAO_AV_FlowSpecSetItor begin = this->reverse_flow_spec_set.begin (); - begin != end; ++begin) + for (TAO_AV_FlowSpecSetItor reversebegin = this->reverse_flow_spec_set.begin (); + reversebegin != end; ++reversebegin) { - TAO_FlowSpec_Entry *entry = *begin; + TAO_FlowSpec_Entry *entry = *reversebegin; // entry->protocol_object ()->start (); if (entry->handler () != 0) entry->handler ()->start (entry->role ()); |