Skip to content

Commit dfbba22

Browse files
jwillemsenmergify[bot]
authored andcommitted
Add include
* ACE/tests/Time_Value_Test.cpp: (cherry picked from commit c0f0bb3) # Conflicts: # ACE/tests/Time_Value_Test.cpp
1 parent 3f3bc92 commit dfbba22

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

ACE/tests/Time_Value_Test.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,16 @@
1616
#include "test_config.h"
1717
#include "ace/ACE.h"
1818
#include "ace/Time_Value.h"
19-
2019
#include "ace/Numeric_Limits.h"
20+
<<<<<<< HEAD
2121

2222
#ifdef ACE_HAS_CPP98_IOSTREAMS
2323
#include <sstream>
2424
#endif
25+
=======
26+
#include <sstream>
27+
#include <type_traits>
28+
>>>>>>> c0f0bb3c14 (Add include)
2529

2630
int
2731
run_main (int, ACE_TCHAR *[])

0 commit comments

Comments
 (0)