Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed friend #2117

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Fixed friend #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45ac786
Fixed friend
jwillemsen Sep 7, 2023
d1a1e20
Use nullptr
jwillemsen Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion TAO/tao/ORB_Core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);
Expand Down
12 changes: 6 additions & 6 deletions TAO/tao/Valuetype/AbstractBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CORBA::AbstractBase::AbstractBase ()
: is_objref_ (false)
, refcount_ (1)
, is_collocated_ (false)
, servant_ (0)
, servant_ (nullptr)
, equivalent_obj_ (CORBA::Object::_nil ())
{
}
Expand Down Expand Up @@ -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 ();
}
Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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
Expand Down
Loading