Skip to content

Commit 97a38d3

Browse files
committed
Incorrect changes
* ACE/ace/Event_Handler.cpp: * ACE/ace/OS_Thread_Adapter.cpp:
1 parent 47aa400 commit 97a38d3

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

ACE/ace/Event_Handler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ ACE_Event_Handler::read_adapter (void *args)
231231
// cache the reactor pointer and use it here.
232232
r->notify ();
233233

234-
return nullptr;
234+
return 0;
235235
}
236236

237237
int

ACE/ace/OS_Thread_Adapter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ ACE_OS_Thread_Adapter::invoke ()
6969
ACE_OS::thr_setcanceltype (val, &old);
7070
}
7171

72-
ACE_THR_FUNC_RETURN status = nullptr;
72+
ACE_THR_FUNC_RETURN status = 0;
7373

7474
ACE_SEH_TRY
7575
{

0 commit comments

Comments
 (0)