diff options
| author | Michi Henning <michi@zeroc.com> | 2007-12-28 14:59:47 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-12-28 14:59:47 +1000 |
| commit | f2ba3e956befe6fdae9d6b70c4fc1f983316029e (patch) | |
| tree | 2bb0dbe354579aa84025fc81b5670c7a9fc20ed7 /cpp | |
| parent | But 2521. (diff) | |
| download | ice-f2ba3e956befe6fdae9d6b70c4fc1f983316029e.tar.bz2 ice-f2ba3e956befe6fdae9d6b70c4fc1f983316029e.tar.xz ice-f2ba3e956befe6fdae9d6b70c4fc1f983316029e.zip | |
Bug 2179: made signal handling argument for Ice.Application a proper
enum in Java and C#.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Application.h | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/Application.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/Ice/Application.h b/cpp/include/Ice/Application.h index 76b8a45a132..dd174217b5a 100644 --- a/cpp/include/Ice/Application.h +++ b/cpp/include/Ice/Application.h @@ -15,12 +15,12 @@ namespace Ice { +enum SignalPolicy { HandleSignals, NoSignalHandling } ; + class ICE_API Application : private IceUtil::noncopyable { public: - enum SignalPolicy { HandleSignals, NoSignalHandling } ; - Application(SignalPolicy = HandleSignals); virtual ~Application(); diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 1e84d1f4957..109d96dba42 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -46,7 +46,7 @@ static Application* _application; static CommunicatorPtr _communicator; static CtrlCHandler* _ctrlCHandler = 0; static bool _nohup = false; -static Application::SignalPolicy _signalPolicy = Application::HandleSignals; +static SignalPolicy _signalPolicy = HandleSignals; #ifdef _WIN32 const DWORD SIGHUP = CTRL_LOGOFF_EVENT; |