summaryrefslogtreecommitdiff
path: root/ace/Signal.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Signal.cpp')
-rw-r--r--ace/Signal.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/ace/Signal.cpp b/ace/Signal.cpp
index 24c72078cc0..ba6688c90e1 100644
--- a/ace/Signal.cpp
+++ b/ace/Signal.cpp
@@ -190,7 +190,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals,
#if (ACE_NSIG > 0) && !defined (CHORUS)
for (int s = 1; s < ACE_NSIG; s++)
- if (signals.is_member (s))
+ if ((signals.is_member (s)) == 1)
ACE_OS::sigaction (s, &this->sa_, 0);
#else /* ACE_NSIG <= 0 || CHORUS */
ACE_UNUSED_ARG (signals);
@@ -218,7 +218,7 @@ ACE_Sig_Action::ACE_Sig_Action (const ACE_Sig_Set &signals,
#if (ACE_NSIG > 0) && !defined (CHORUS)
for (int s = 1; s < ACE_NSIG; s++)
- if (signals.is_member (s))
+ if ((signals.is_member (s)) == 1)
ACE_OS::sigaction (s, &this->sa_, 0);
#else /* ACE_NSIG <= 0 || CHORUS */
ACE_UNUSED_ARG (signals);
@@ -392,7 +392,7 @@ ACE_Sig_Handler::remove_handler (int signum,
// Register either the new disposition or restore the default.
return new_disp->register_action (signum, old_disp);
}
- else
+
return -1;
}
@@ -474,6 +474,10 @@ ACE_Sig_Adapter::ACE_Sig_Adapter (ACE_Sig_Handler_Ex sig_func,
// ACE_TRACE ("ACE_Sig_Adapter::ACE_Sig_Adapter");
}
+ACE_Sig_Adapter::~ACE_Sig_Adapter ()
+{
+}
+
int
ACE_Sig_Adapter::sigkey (void)
{
@@ -693,8 +697,8 @@ ACE_Sig_Handlers::register_handler (int signum,
return ace_sig_adapter->sigkey ();
}
}
- else
- return -1;
+
+ return -1;
}
// Remove the ACE_Event_Handler currently associated with <signum>.