Skip to content

Commit 47aa400

Browse files
committed
Incorrect changes
* ACE/ace/Thread_Adapter.cpp: * ACE/ace/Thread_Control.cpp: * ACE/ace/Thread_Manager.cpp:
1 parent 8cd85d8 commit 47aa400

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

ACE/ace/Thread_Adapter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ ACE_Thread_Adapter::invoke_i ()
124124
ACE_OS::thr_setcanceltype (val, &old);
125125
}
126126

127-
ACE_THR_FUNC_RETURN status = nullptr;
127+
ACE_THR_FUNC_RETURN status = 0;
128128

129129
ACE_SEH_TRY
130130
{

ACE/ace/Thread_Control.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ACE_Thread_Control::insert (ACE_Thread_Manager *tm, bool insert)
3434
ACE_Thread_Control::ACE_Thread_Control (ACE_Thread_Manager *t,
3535
int insert)
3636
: tm_ (t),
37-
status_ (nullptr)
37+
status_ (0)
3838
{
3939
ACE_OS_TRACE ("ACE_Thread_Control::ACE_Thread_Control");
4040

@@ -73,7 +73,7 @@ ACE_Thread_Control::exit (ACE_THR_FUNC_RETURN exit_status, int do_thr_exit)
7373
// exit the thread after cleaning up TSS.
7474
ACE_OS::thr_exit (exit_status);
7575
#endif /* ! ACE_HAS_TSS_EMULATION */
76-
return nullptr;
76+
return 0;
7777
}
7878
}
7979

ACE/ace/Thread_Manager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ ACE_Thread_Manager::exit (ACE_THR_FUNC_RETURN status, bool do_thread_exit)
16751675

16761676
// Just hold onto the guard while finding this thread's id and
16771677
{
1678-
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, nullptr));
1678+
ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, 0));
16791679

16801680
// Find the thread id, but don't use the cache. It might have been
16811681
// deleted already.
@@ -1701,7 +1701,7 @@ ACE_Thread_Manager::exit (ACE_THR_FUNC_RETURN status, bool do_thread_exit)
17011701
// storage this call can return (don't ask...).
17021702
}
17031703

1704-
return nullptr;
1704+
return 0;
17051705
}
17061706

17071707
// Wait for all the threads to exit.

0 commit comments

Comments
 (0)