diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-06-11 21:09:09 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-06-11 21:09:09 +0000 |
| commit | 4e466c9169eb28a6fa3ee1b1bfedf8060e2f38c6 (patch) | |
| tree | c44a3b335433a6a78929e14359d36a49e9cb801d /cpp/src | |
| parent | fix (diff) | |
| download | ice-4e466c9169eb28a6fa3ee1b1bfedf8060e2f38c6.tar.bz2 ice-4e466c9169eb28a6fa3ee1b1bfedf8060e2f38c6.tar.xz ice-4e466c9169eb28a6fa3ee1b1bfedf8060e2f38c6.zip | |
fixed misuse of iterators
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceBox/ServiceManagerI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceBox/ServiceManagerI.cpp b/cpp/src/IceBox/ServiceManagerI.cpp index ea1831ee051..428b65beb80 100644 --- a/cpp/src/IceBox/ServiceManagerI.cpp +++ b/cpp/src/IceBox/ServiceManagerI.cpp @@ -120,7 +120,7 @@ IceBox::ServiceManagerI::run() { try { - (*r).second.service->start(); + r->second.service->start(); } catch (const FailureException&) { @@ -129,7 +129,7 @@ IceBox::ServiceManagerI::run() catch (const Exception& ex) { FailureException e; - e.reason = "ServiceManager: exception in start for service " + (*r).first + ": " + ex.ice_name(); + e.reason = "ServiceManager: exception in start for service " + r->first + ": " + ex.ice_name(); throw e; } } @@ -292,7 +292,7 @@ IceBox::ServiceManagerI::stop(const string& service) { map<string,ServiceInfo>::iterator r = _services.find(service); assert(r != _services.end()); - ServiceInfo info = (*r).second; + ServiceInfo info = r->second; _services.erase(r); try @@ -322,12 +322,12 @@ IceBox::ServiceManagerI::stop(const string& service) void IceBox::ServiceManagerI::stopAll() { - map<string,ServiceInfo>::const_iterator r; - for (r = _services.begin(); r != _services.end(); ++r) + map<string,ServiceInfo>::const_iterator r = _services.begin(); + while (r != _services.end()) { try { - stop((*r).first); + stop((*r++).first); } catch (const FailureException& ex) { |