diff options
| author | Erik Sohns <esohns@users.noreply.github.com> | 2023-04-06 11:09:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 11:09:11 +0200 |
| commit | a3a7c2a50383ebf00534c28014704ce57e092821 (patch) | |
| tree | 0de4a576c9929ac6d821462e1693882654f2a456 /TAO/tao/PortableServer/POA_Current_Factory.cpp | |
| parent | 5625244fd7bb77bafabce28fdec790f51ef50080 (diff) | |
| parent | b50aba0fdce1069b9aa9b1baac9adee396663779 (diff) | |
| download | ATCD-a3a7c2a50383ebf00534c28014704ce57e092821.tar.gz | |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'TAO/tao/PortableServer/POA_Current_Factory.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/POA_Current_Factory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tao/PortableServer/POA_Current_Factory.cpp b/TAO/tao/PortableServer/POA_Current_Factory.cpp index 7cad00bf77c..7692b49cdc6 100644 --- a/TAO/tao/PortableServer/POA_Current_Factory.cpp +++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp @@ -9,10 +9,10 @@ TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr, int, ACE_TCHAR * []) { - TAO::Portable_Server::POA_Current* adapter = 0; + TAO::Portable_Server::POA_Current* adapter = nullptr; ACE_NEW_RETURN (adapter, TAO::Portable_Server::POA_Current (), - 0); + nullptr); return adapter; } |