Skip to content

Commit 7c5c5af

Browse files
jwillemsenmergify[bot]
authored andcommitted
Add missing includes
* ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp: * ACE/examples/Threads/task_four.cpp: * ACE/examples/Threads/thread_pool.cpp: (cherry picked from commit 814302d) # Conflicts: # ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp # ACE/examples/Threads/thread_pool.cpp
1 parent e33dd50 commit 7c5c5af

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

ACE/examples/Reactor/WFMO_Reactor/Window_Messages.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,18 @@
1010
*/
1111
//=============================================================================
1212

13-
1413
#include "ace/OS_main.h"
1514

1615
#if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO)
1716

1817
#include "ace/Msg_WFMO_Reactor.h"
1918
#include "ace/Reactor.h"
2019
#include "ace/Auto_Event.h"
20+
<<<<<<< HEAD
2121
#include <memory>
22+
=======
23+
#include "ace/Truncate.h"
24+
>>>>>>> 814302d50b (Add missing includes)
2225

2326
class Event_Handler : public ACE_Event_Handler
2427
{

ACE/examples/Threads/task_four.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "ace/OS_main.h"
3434
#include "ace/Task.h"
3535
#include "ace/Service_Config.h"
36+
#include "ace/Truncate.h"
3637

3738
#if defined (ACE_HAS_THREADS)
3839

ACE/examples/Threads/thread_pool.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515
#include "ace/OS_main.h"
1616
#include "ace/Task.h"
1717
#include "ace/Service_Config.h"
18+
<<<<<<< HEAD
1819

20+
=======
21+
#include "ace/Truncate.h"
22+
>>>>>>> 814302d50b (Add missing includes)
1923

2024
#if defined (ACE_HAS_THREADS)
2125

0 commit comments

Comments
 (0)