summaryrefslogtreecommitdiff
path: root/TAO/tao/GUIResource_Factory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/GUIResource_Factory.cpp')
-rw-r--r--TAO/tao/GUIResource_Factory.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/TAO/tao/GUIResource_Factory.cpp b/TAO/tao/GUIResource_Factory.cpp
index 27f7a008861..18e9854bf0d 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -1,22 +1,23 @@
#include "tao/GUIResource_Factory.h"
#include "ace/Reactor.h"
+#include "ace/Guard_T.h"
#include "tao/debug.h"
TAO_BEGIN_VERSIONED_NAMESPACE_DECL
namespace TAO
{
- GUIResource_Factory::GUIResource_Factory (void)
+ GUIResource_Factory::GUIResource_Factory ()
: dynamically_allocated_reactor_ (false)
{
}
- GUIResource_Factory::~GUIResource_Factory (void)
+ GUIResource_Factory::~GUIResource_Factory ()
{
}
ACE_Reactor *
- GUIResource_Factory::get_reactor (void)
+ GUIResource_Factory::get_reactor ()
{
// @@Marek, do we need a lock here??
// @Bala, I suppose we don't need locking for any
@@ -27,17 +28,17 @@ namespace TAO
// what for. Nevertheless, just for a case I sync the creation of reactor.
// I think, that double checked locking is
// not necessary, because the performance is not an issue here.
- ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+ ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, nullptr);
- ACE_Reactor *reactor = 0;
+ ACE_Reactor *reactor = nullptr;
ACE_NEW_RETURN (reactor,
ACE_Reactor (this->reactor_impl (), 1),
- 0);
+ nullptr);
if (reactor->initialized () == 0)
{
delete reactor;
- reactor = 0;
+ reactor = nullptr;
}
else
this->dynamically_allocated_reactor_ = true;