diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-04-22 18:02:53 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-04-22 18:02:53 -0400 |
| commit | bd960c70612403251494030dffdaa86cf46a6384 (patch) | |
| tree | 3618f57a3d89c3eab97b0d42f7730e62143408dd /cpp/src/IceUtil/CtrlCHandler.cpp | |
| parent | Fix (ICE-7780) - Glacier2::Application cleanup (diff) | |
| download | ice-bd960c70612403251494030dffdaa86cf46a6384.tar.bz2 ice-bd960c70612403251494030dffdaa86cf46a6384.tar.xz ice-bd960c70612403251494030dffdaa86cf46a6384.zip | |
Improved C++11 version of CtrlCHandler
Diffstat (limited to 'cpp/src/IceUtil/CtrlCHandler.cpp')
| -rw-r--r-- | cpp/src/IceUtil/CtrlCHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp index 85d2186e386..656555aa74f 100644 --- a/cpp/src/IceUtil/CtrlCHandler.cpp +++ b/cpp/src/IceUtil/CtrlCHandler.cpp @@ -25,7 +25,8 @@ using namespace IceUtil; namespace { -CtrlCHandlerCallback _callback = 0; +CtrlCHandlerCallback _callback = ICE_NULLPTR; + const CtrlCHandler* _handler = 0; IceUtil::Mutex* globalMutex = 0; @@ -173,7 +174,7 @@ sigwaitThread(void*) callback = _callback; } - if(callback != 0) + if(callback) { callback(signal); } @@ -235,8 +236,7 @@ CtrlCHandler::CtrlCHandler(CtrlCHandlerCallback callback) CtrlCHandler::~CtrlCHandler() { // - // Clear the handler, the sigwaitThread will exit if _handler is - // nil. + // Clear the handler, the sigwaitThread will exit if _handler is null // { IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex); |