summaryrefslogtreecommitdiff
path: root/ACE/ace/Proactor.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-10-03 19:38:24 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-10-03 19:38:24 +0000
commit7a96a0d98d9bc982ef3964a8bfd69913a3ca4373 (patch)
tree71bb43af2b5138b239bf793029785076922d9ac2 /ACE/ace/Proactor.cpp
parent120546b69ce995607de011978e2b0ba51b073cda (diff)
downloadATCD-7a96a0d98d9bc982ef3964a8bfd69913a3ca4373.tar.gz
Wed Oct 3 19:31:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ACE/ace/Proactor.cpp')
-rw-r--r--ACE/ace/Proactor.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp
index 5eef3596e59..a96b8dde528 100644
--- a/ACE/ace/Proactor.cpp
+++ b/ACE/ace/Proactor.cpp
@@ -46,7 +46,7 @@ ACE_Proactor *ACE_Proactor::proactor_ = 0;
/// Controls whether the Proactor is deleted when we shut down (we can
/// only delete it safely if we created it!)
-int ACE_Proactor::delete_proactor_ = 0;
+bool ACE_Proactor::delete_proactor_ = false;
/**
* @class ACE_Proactor_Timer_Handler
@@ -376,7 +376,7 @@ ACE_Proactor::instance (size_t /* threads */)
ACE_Proactor,
0);
- ACE_Proactor::delete_proactor_ = 1;
+ ACE_Proactor::delete_proactor_ = true;
ACE_REGISTER_FRAMEWORK_COMPONENT(ACE_Proactor, ACE_Proactor::proactor_);
}
}
@@ -384,7 +384,7 @@ ACE_Proactor::instance (size_t /* threads */)
}
ACE_Proactor *
-ACE_Proactor::instance (ACE_Proactor * r, int delete_proactor)
+ACE_Proactor::instance (ACE_Proactor * r, bool delete_proactor)
{
ACE_TRACE ("ACE_Proactor::instance");
@@ -410,10 +410,9 @@ ACE_Proactor::close_singleton (void)
if (ACE_Proactor::delete_proactor_)
{
-
delete ACE_Proactor::proactor_;
ACE_Proactor::proactor_ = 0;
- ACE_Proactor::delete_proactor_ = 0;
+ ACE_Proactor::delete_proactor_ = false;
}
}