diff options
| author | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-09 23:03:21 +0200 |
| commit | 3e685a12bfd92a4ffd86c808ba0f34df907de5c8 (patch) | |
| tree | 2ef8fb8e028d4f14d1516a98f2a18dbadb46a5d7 /cpp/src/Ice/RetryQueue.cpp | |
| parent | Update to latest gradle builder (diff) | |
| parent | AIX port (diff) | |
| download | ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.bz2 ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.tar.xz ice-3e685a12bfd92a4ffd86c808ba0f34df907de5c8.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/src/Ice/RetryQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/RetryQueue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp index 9c81aa1bead..f74988f65a9 100644 --- a/cpp/src/Ice/RetryQueue.cpp +++ b/cpp/src/Ice/RetryQueue.cpp @@ -116,7 +116,7 @@ IceInternal::RetryQueue::destroy() Lock sync(*this); assert(_instance); - set<RetryTaskPtr>::const_iterator p = _requests.begin(); + set<RetryTaskPtr>::iterator p = _requests.begin(); while(p != _requests.end()) { if(_instance->timer()->cancel(*p)) |