Skip to content

Commit 69f4f2c

Browse files
committed
Merge #18357: Fix missing header in sync.h
686c545 Fix missing header in sync.h (João Barbosa) Pull request description: `std::string` is referenced in `sync.h` but the relevant header is not explicitly included as required by current guideline. Furthermore on osx 10.14.6 with clang-900.0.31 the following error occurs: ``` In file included from threadinterrupt.cpp:6: In file included from ./threadinterrupt.h:8: ./sync.h:206:21: error: implicit instantiation of undefined template 'std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >' std::string lockname; ``` ACKs for top commit: practicalswift: ACK 686c545 laanwj: ACK 686c545 Tree-SHA512: 7c1acdfa5b0dd148d1114e14c9450d5907006e63e1a04e82ed8a1e29757925476e6f8ef6024b0c6d1bb596623115209ad580d5035be1e4785337bd01b738c9f2
2 parents d31f925 + 686c545 commit 69f4f2c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/sync.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
#include <util/macros.h>
1111

1212
#include <condition_variable>
13-
#include <thread>
1413
#include <mutex>
15-
14+
#include <string>
15+
#include <thread>
1616

1717
////////////////////////////////////////////////
1818
// //

0 commit comments

Comments
 (0)