Merge pull request #2117 from jwillemsen/jwi-fixfriend

Fixed friend
DOCGroup · Sep 7, 2023 · b58162e · b58162e
2 parents c625a26 + d1a1e20
commit b58162e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
@@ -157,7 +157,7 @@ namespace PortableInterceptor
  */
 class TAO_Export TAO_ORB_Core
 {
-  friend class TAO_ORB_Core_Decr_Refcnt;
+  friend struct TAO_ORB_Core_Decr_Refcnt;
   friend TAO_Export CORBA::ORB_ptr CORBA::ORB_init (int &,
                                          ACE_TCHAR *argv[],
                                          const char *);

diff --git a/TAO/tao/Valuetype/AbstractBase.cpp b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -20,7 +20,7 @@ CORBA::AbstractBase::AbstractBase ()
   : is_objref_ (false)
   , refcount_ (1)
   , is_collocated_ (false)
-  , servant_ (0)
+  , servant_ (nullptr)
   , equivalent_obj_ (CORBA::Object::_nil ())
 {
 }
@@ -105,12 +105,12 @@ CORBA::AbstractBase::_to_value ()
 {
   if (this->is_objref_)
     {
-      return 0;
+      return nullptr;
     }
 
   CORBA::ValueBase *retval = this->_tao_to_value ();
 
-  if (retval != 0)
+  if (retval != nullptr)
     {
       retval->_add_ref ();
     }
@@ -229,10 +229,10 @@ operator<< (TAO_OutputCDR &strm, const CORBA::AbstractBase_ptr abs)
 CORBA::Boolean
 operator>> (TAO_InputCDR &strm, CORBA::AbstractBase_ptr &abs)
 {
-  abs = 0;
+  abs = nullptr;
   CORBA::Boolean discriminator = false;
   ACE_InputCDR::to_boolean tb (discriminator);
-  TAO_ORB_Core *orb_core = 0;
+  TAO_ORB_Core *orb_core = nullptr;
 
   if (strm >> tb)
     {
@@ -378,7 +378,7 @@ CORBA::AbstractBase::_tao_stream_v (std::ostream &strm) const
 CORBA::ValueBase *
 CORBA::AbstractBase::_tao_to_value ()
 {
-  return 0;
+  return nullptr;
 }
 
 CORBA::Object_ptr