Use std::thread rather than pthreads in AtomicHashMapTest

[folly.git] / folly / Subprocess.cpp

diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index ad2c077dcc9d2729d4337ed5f3a5a5c4fbc8ba89..d7d28d9f4b150dd58375023bbf78ef85f4341105 100644 (file)
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -24,9 +24,6 @@
 #include <sys/prctl.h>
 #endif
 #include <fcntl.h>
-#include <poll.h>
-
-#include <unistd.h>
 
 #include <array>
 #include <algorithm>
@@ -43,6 +40,8 @@
 #include <folly/String.h>
 #include <folly/io/Cursor.h>
 #include <folly/portability/Environment.h>
+#include <folly/portability/Sockets.h>
+#include <folly/portability/Unistd.h>
 
 constexpr int kExecFailure = 127;
 constexpr int kChildFailure = 126;
@@ -833,7 +832,8 @@ std::vector<Subprocess::ChildPipe> Subprocess::takeOwnershipOfPipes() {
   for (auto& p : pipes_) {
     pipes.emplace_back(p.childFd, std::move(p.pipe));
   }
-  pipes_.clear();
+  // release memory
+  std::vector<Pipe>().swap(pipes_);
   return pipes;
 }