summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2019-08-21 17:28:41 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2019-08-21 17:28:41 +0200
commitcf0b9f6d5bf174c7a663300c26f19febbe6aeef8 (patch)
tree93d071f81a91fd7ab68236062a9990d8a73a940a
parent59f4874b3b6c23f1080fbf1c40b060d31a0c7557 (diff)
downloadATCD-cf0b9f6d5bf174c7a663300c26f19febbe6aeef8.tar.gz
Changed suppress_notify_renew flag from int to bool
* ACE/ace/Select_Reactor_Base.h: * ACE/ace/Select_Reactor_Base.inl: * ACE/ace/Select_Reactor_T.cpp: * ACE/ace/TP_Reactor.cpp:
-rw-r--r--ACE/ace/Select_Reactor_Base.h7
-rw-r--r--ACE/ace/Select_Reactor_Base.inl4
-rw-r--r--ACE/ace/Select_Reactor_T.cpp2
-rw-r--r--ACE/ace/TP_Reactor.cpp4
4 files changed, 8 insertions, 9 deletions
diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h
index 1dccc8225ba..58440ea6bf0 100644
--- a/ACE/ace/Select_Reactor_Base.h
+++ b/ACE/ace/Select_Reactor_Base.h
@@ -588,14 +588,13 @@ protected:
/// Controls/access whether the notify handler should renew the
/// Select_Reactor's token or not.
- int supress_notify_renew (void);
- void supress_notify_renew (int sr);
+ bool supress_notify_renew (void);
+ void supress_notify_renew (bool sr);
private:
-
/// Determine whether we should renew Select_Reactor's token after handling
/// the notification message.
- int supress_renew_;
+ bool supress_renew_;
/// Deny access since member-wise won't work...
ACE_Select_Reactor_Impl (const ACE_Select_Reactor_Impl &);
diff --git a/ACE/ace/Select_Reactor_Base.inl b/ACE/ace/Select_Reactor_Base.inl
index 68933bb2e04..2563f77c007 100644
--- a/ACE/ace/Select_Reactor_Base.inl
+++ b/ACE/ace/Select_Reactor_Base.inl
@@ -134,14 +134,14 @@ ACE_Select_Reactor_Impl::ACE_Select_Reactor_Impl (bool ms)
# pragma warning (pop)
#endif
-ACE_INLINE int
+ACE_INLINE bool
ACE_Select_Reactor_Impl::supress_notify_renew (void)
{
return this->supress_renew_;
}
ACE_INLINE void
-ACE_Select_Reactor_Impl::supress_notify_renew (int sr)
+ACE_Select_Reactor_Impl::supress_notify_renew (bool sr)
{
this->supress_renew_ = sr;
}
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index fbe182efeca..937dfaf91b0 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -190,7 +190,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::renew (void)
{
ACE_TRACE ("ACE_Select_Reactor_T::renew");
#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
- if (this->supress_notify_renew () == 0)
+ if (!this->supress_notify_renew ())
this->token_.renew (this->requeue_position_);
#endif /* defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) */
}
diff --git a/ACE/ace/TP_Reactor.cpp b/ACE/ace/TP_Reactor.cpp
index 41942a60b58..f1bb31bf92f 100644
--- a/ACE/ace/TP_Reactor.cpp
+++ b/ACE/ace/TP_Reactor.cpp
@@ -100,7 +100,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (ACE_Sig_Handler *sh,
: ACE_Select_Reactor (sh, tq, ACE_DISABLE_NOTIFY_PIPE_DEFAULT, 0, mask_signals, s_queue)
{
ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor");
- this->supress_notify_renew (1);
+ this->supress_notify_renew (true);
}
ACE_TP_Reactor::ACE_TP_Reactor (size_t max_number_of_handles,
@@ -112,7 +112,7 @@ ACE_TP_Reactor::ACE_TP_Reactor (size_t max_number_of_handles,
: ACE_Select_Reactor (max_number_of_handles, restart, sh, tq, ACE_DISABLE_NOTIFY_PIPE_DEFAULT, 0, mask_signals, s_queue)
{
ACE_TRACE ("ACE_TP_Reactor::ACE_TP_Reactor");
- this->supress_notify_renew (1);
+ this->supress_notify_renew (true);
}
int