From 292114e68b44623de91c107d989a83fb0d183d29 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Fri, 23 Apr 2021 14:37:28 +0200
Subject: Minor cleanup, layout changes, use nullptr

    * ACE/ACEXML/common/HttpCharStream.cpp:
    * ACE/ACEXML/common/HttpCharStream.h:
    * ACE/ACEXML/common/URL_Addr.cpp:
    * ACE/ACEXML/common/XML_Codecs.cpp:
    * ACE/Kokyu/Default_Dispatcher_Impl.cpp:
    * ACE/Kokyu/Kokyu.cpp:
    * ACE/ace/Asynch_IO.h:
    * ACE/ace/Local_Memory_Pool.cpp:
    * ACE/ace/Parse_Node.h:
    * ACE/ace/Proactor.cpp:
    * ACE/ace/Thread_Manager.cpp:
    * ACE/tests/Priority_Reactor_Test.cpp:
    * TAO/tao/Stub.h:
    * TAO/tao/Stub.inl:
---
 TAO/tao/Stub.h   | 2 +-
 TAO/tao/Stub.inl | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'TAO/tao')

diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index de3020ed58c..feaf10c6ce2 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -423,7 +423,7 @@ protected:
 class TAO_Export TAO_Stub_Auto_Ptr
 {
 public:
-  explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0);
+  explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = nullptr);
   TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap);
   TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs);
   ~TAO_Stub_Auto_Ptr ();
diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl
index dfc4a708bfc..b02fff98755 100644
--- a/TAO/tao/Stub.inl
+++ b/TAO/tao/Stub.inl
@@ -440,7 +440,7 @@ TAO_Stub_Auto_Ptr::release (void)
 {
   ACE_TRACE ("TAO_Stub_Auto_Ptr::release");
   TAO_Stub *old = this->p_;
-  this->p_ = 0;
+  this->p_ = nullptr;
   return old;
 }
 
@@ -448,7 +448,7 @@ ACE_INLINE void
 TAO_Stub_Auto_Ptr::reset (TAO_Stub *p)
 {
   ACE_TRACE ("TAO_Stub_Auto_Ptr::reset");
-  if (this->get () != p && this->get () != 0)
+  if (this->get () != p && this->get () != nullptr)
     this->get ()->_decr_refcnt ();
   this->p_ = p;
 }
@@ -482,12 +482,11 @@ ACE_INLINE
 TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void)
 {
   ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr");
-  if (this->get() != 0)
+  if (this->get() != nullptr)
     this->get ()->_decr_refcnt ();
 }
 
 // Accessor methods to the underlying Stub Object
-
 ACE_INLINE TAO_Stub &
 TAO_Stub_Auto_Ptr::operator *() const
 {
@@ -496,5 +495,4 @@ TAO_Stub_Auto_Ptr::operator *() const
   return *this->get ();
 }
 
-
 TAO_END_VERSIONED_NAMESPACE_DECL
-- 
cgit v1.2.1