updates for this branch

Author: mitza-oci

TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp

@@ -186,7 +186,7 @@ TAO::SSLIOP::Acceptor::create_new_profile (const TAO::ObjectKey &object_key,
       component.component_data.length (length);
       CORBA::Octet *buf = component.component_data.get_buffer ();
       for (ACE_Message_Block const *mb = cdr.begin ();
-           mb != nullptr;
+           mb;
            mb = mb->cont ())
         {
           ACE_OS::memcpy (buf, mb->rd_ptr (), mb->length ());

TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp

@@ -160,7 +160,7 @@ TAO_SSLIOP_Endpoint::is_equivalent (const TAO_Endpoint *other_endpoint)
   // numbers often may not make sense. Or may not being used anyway.
   // Therefore, we only need to directly compare the hosts. See also the
   // comments in the hash() method.
-  if (this->iiop_endpoint () == nullptr || endpoint->iiop_endpoint () == nullptr)
+  if (!this->iiop_endpoint () || !endpoint->iiop_endpoint ())
     return false;
 
   if (ACE_OS::strcmp (this->iiop_endpoint ()->host (),