Skip to content

Commit 8cd85d8

Browse files
committed
Use nullptr, changed by clang-tidy
* TAO/tao/Acceptor_Impl.cpp: * TAO/tao/Fixed_Array_Argument_T.cpp: * TAO/tao/ORB_Core.cpp: * TAO/tao/Object_T.cpp: * TAO/tao/Thread_Per_Connection_Handler.cpp: * TAO/tao/Transport_Cache_Manager_T.cpp: * TAO/tao/Var_Array_Argument_T.cpp:
1 parent 1eaed17 commit 8cd85d8

7 files changed

Lines changed: 12 additions & 12 deletions

TAO/tao/Acceptor_Impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
118118
if (f->activate_server_connections ())
119119
{
120120
// Thread-per-connection concurrency model
121-
TAO_Thread_Per_Connection_Handler *tpch = 0;
121+
TAO_Thread_Per_Connection_Handler *tpch = nullptr;
122122

123123
ACE_NEW_RETURN (tpch,
124124
TAO_Thread_Per_Connection_Handler (sh,
@@ -167,7 +167,7 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh,
167167

168168
if (TAO_debug_level > 0)
169169
{
170-
const ACE_TCHAR *error_message = 0;
170+
const ACE_TCHAR *error_message = nullptr;
171171
if (f->activate_server_connections ())
172172
error_message = ACE_TEXT("could not activate new connection");
173173
else

TAO/tao/Fixed_Array_Argument_T.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ TAO::In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone ()
5353
typename ARRAY_TRAITS::slice_type * tmp_ptr = 0;
5454
ACE_ALLOCATOR_RETURN (tmp_ptr,
5555
ARRAY_TRAITS::alloc (),
56-
0);
56+
nullptr);
5757
ARRAY_TRAITS::copy (tmp_ptr, this->x_.in ());
5858

5959
In_Fixed_Array_Clonable_Argument_T<S_forany,Insert_Policy>* clone_arg

TAO/tao/ORB_Core.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] )
878878

879879
(ACE_LOG_MSG->*flagop)(value);
880880
}
881-
else if (0 != (current_arg = arg_shifter.get_the_parameter
881+
else if (nullptr != (current_arg = arg_shifter.get_the_parameter
882882
(ACE_TEXT("-ORBHandleLoggingStrategyEvents"))))
883883
{
884884
ACE_Logging_Strategy *logging_strategy =

TAO/tao/Object_T.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ namespace TAO
5151
{
5252
TAO_Stub* stub = obj->_stubobj ();
5353

54-
if (stub != 0)
54+
if (stub != nullptr)
5555
{
5656
stub->_incr_refcnt ();
5757

TAO/tao/Thread_Per_Connection_Handler.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ TAO_Thread_Per_Connection_Handler::activate_ch (long flags,
5555
0,
5656
ACE_DEFAULT_THREAD_PRIORITY,
5757
-1,
58-
0,
59-
0,
60-
0,
61-
0,
62-
0,
58+
nullptr,
59+
nullptr,
60+
nullptr,
61+
nullptr,
62+
nullptr,
6363
&thread_names[0]);
6464
}
6565

TAO/tao/Transport_Cache_Manager_T.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace TAO
3232
: percent_ (percent)
3333
, purging_strategy_ (purging)
3434
, cache_map_ (cache_maximum)
35-
, cache_lock_ (0)
35+
, cache_lock_ (nullptr)
3636
, cache_maximum_ (cache_maximum)
3737
#if defined (TAO_HAS_MONITOR_POINTS) && (TAO_HAS_MONITOR_POINTS == 1)
3838
, purge_monitor_ (0)

TAO/tao/Var_Array_Argument_T.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ TAO::In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>::clone ()
5555
typename ARRAY_TRAITS::slice_type * tmp_ptr = 0;
5656
ACE_ALLOCATOR_RETURN (tmp_ptr,
5757
ARRAY_TRAITS::alloc (),
58-
0);
58+
nullptr);
5959
ARRAY_TRAITS::copy(tmp_ptr, this->x_.in ());
6060

6161
In_Var_Array_Clonable_Argument_T<S_forany,Insert_Policy>* clone_arg

0 commit comments

Comments
 (0)