diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-06-25 11:45:06 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-06-25 11:45:06 -0230 |
| commit | e23d0815122c22344cd6ea66c0c7c46e49231599 (patch) | |
| tree | 1763c46e3efc8c4cf1f6f60a161c5db7fdd54c05 /cpp/src/Ice/Application.cpp | |
| parent | IceStorm/replicated demo now recognizes when new IceStorm instance scome online (diff) | |
| download | ice-e23d0815122c22344cd6ea66c0c7c46e49231599.tar.bz2 ice-e23d0815122c22344cd6ea66c0c7c46e49231599.tar.xz ice-e23d0815122c22344cd6ea66c0c7c46e49231599.zip | |
Changed setting Application signal handling policy to use an enum
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
| -rw-r--r-- | cpp/src/Ice/Application.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 43535788819..48a6c38d135 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -45,7 +45,7 @@ static Application* _application; static CommunicatorPtr _communicator; static CtrlCHandler* _ctrlCHandler = 0; static bool _nohup = false; -static bool _useCtrlCHandler = true; +static Application::SignalPolicy _signalPolicy = Application::HandleSignals; #ifdef _WIN32 const DWORD SIGHUP = CTRL_LOGOFF_EVENT; @@ -258,9 +258,9 @@ callbackOnInterruptCallback(int signal) } -Ice::Application::Application(bool useCtrlCHandler) +Ice::Application::Application(SignalPolicy signalPolicy) { - _useCtrlCHandler = useCtrlCHandler; + _signalPolicy = signalPolicy; } Ice::Application::~Application() @@ -313,7 +313,7 @@ Ice::Application::main(int argc, char* argv[], const InitializationData& initDat } int status; - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { try { @@ -412,7 +412,7 @@ Ice::Application::communicator() void Ice::Application::destroyOnInterrupt() { - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { if(_ctrlCHandler != 0) { @@ -435,7 +435,7 @@ Ice::Application::destroyOnInterrupt() void Ice::Application::shutdownOnInterrupt() { - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { if(_ctrlCHandler != 0) { @@ -458,7 +458,7 @@ Ice::Application::shutdownOnInterrupt() void Ice::Application::ignoreInterrupt() { - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { if(_ctrlCHandler != 0) { @@ -481,7 +481,7 @@ Ice::Application::ignoreInterrupt() void Ice::Application::callbackOnInterrupt() { - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { if(_ctrlCHandler != 0) { @@ -504,7 +504,7 @@ Ice::Application::callbackOnInterrupt() void Ice::Application::holdInterrupt() { - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { if(_ctrlCHandler != 0) { @@ -528,7 +528,7 @@ Ice::Application::holdInterrupt() void Ice::Application::releaseInterrupt() { - if(_useCtrlCHandler) + if(_signalPolicy == HandleSignals) { if(_ctrlCHandler != 0) { |