diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-04-21 17:57:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-04-21 17:57:07 +0200 |
| commit | 0d9e14a134cba4ce19f40103e9c9615e1b0a7a86 (patch) | |
| tree | a75fbec57a387ed4236eec8d5251495b7cbd7afa /cpp/include/IceUtil/Timer.h | |
| parent | Fixed potential IceUtil::NullHandleException (diff) | |
| download | ice-0d9e14a134cba4ce19f40103e9c9615e1b0a7a86.tar.bz2 ice-0d9e14a134cba4ce19f40103e9c9615e1b0a7a86.tar.xz ice-0d9e14a134cba4ce19f40103e9c9615e1b0a7a86.zip | |
Fixed bug 2972 & 3013
Diffstat (limited to 'cpp/include/IceUtil/Timer.h')
| -rw-r--r-- | cpp/include/IceUtil/Timer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h index 545fecdddfe..f0920bb03b3 100644 --- a/cpp/include/IceUtil/Timer.h +++ b/cpp/include/IceUtil/Timer.h @@ -53,7 +53,8 @@ public: Timer(); // - // Destroy the timer and join with its execution thread. + // Destroy the timer and detach its execution thread if the calling thread + // is the timer thread, join the timer execution thread otherwise. // void destroy(); |