aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2020-03-16 19:45:38 +0800
committerfanquake <fanquake@gmail.com>2020-03-16 20:04:54 +0800
commit69f4f2c43358e2e86b70f8e89a404781be591002 (patch)
treee58280f1ad90efcdac06423e6426f38d515d873f /src
parentd31f92586a05803fcc372b3febb8bd36b7c1ac32 (diff)
parent686c5456f2fcf7e301907223d16a85f7eb378c6c (diff)
Merge #18357: Fix missing header in sync.h
686c5456f2fcf7e301907223d16a85f7eb378c6c 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 686c5456f2fcf7e301907223d16a85f7eb378c6c laanwj: ACK 686c5456f2fcf7e301907223d16a85f7eb378c6c Tree-SHA512: 7c1acdfa5b0dd148d1114e14c9450d5907006e63e1a04e82ed8a1e29757925476e6f8ef6024b0c6d1bb596623115209ad580d5035be1e4785337bd01b738c9f2
Diffstat (limited to 'src')
-rw-r--r--src/sync.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sync.h b/src/sync.h
index 204734c273..ead2cdc67b 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -10,9 +10,9 @@
#include <util/macros.h>
#include <condition_variable>
-#include <thread>
#include <mutex>
-
+#include <string>
+#include <thread>
////////////////////////////////////////////////
// //