Kill FOLLY_ALIGNED etc

[folly.git] / folly / executors / ThreadPoolExecutor.h

diff --git a/folly/executors/ThreadPoolExecutor.h b/folly/executors/ThreadPoolExecutor.h
index 79ca29057088a41ba151582ae404fd6628658106..38154a862fc9db56ffd87733550dc44f5e2a741c 100644 (file)
--- a/folly/executors/ThreadPoolExecutor.h
+++ b/folly/executors/ThreadPoolExecutor.h
@@ -15,14 +15,14 @@
  */
 
 #pragma once
-#include <folly/Baton.h>
 #include <folly/Executor.h>
 #include <folly/Memory.h>
 #include <folly/RWSpinLock.h>
-#include <folly/concurrency/GlobalThreadPoolList.h>
-#include <folly/executors/LifoSemMPMCQueue.h>
-#include <folly/executors/NamedThreadFactory.h>
+#include <folly/executors/GlobalThreadPoolList.h>
+#include <folly/executors/task_queue/LifoSemMPMCQueue.h>
+#include <folly/executors/thread_factory/NamedThreadFactory.h>
 #include <folly/io/async/Request.h>
+#include <folly/synchronization/Baton.h>
 
 #include <algorithm>
 #include <mutex>
@@ -50,7 +50,7 @@ class ThreadPoolExecutor : public virtual folly::Executor {
     threadFactory_ = std::move(threadFactory);
   }
 
-  std::shared_ptr<ThreadFactory> getThreadFactory(void) {
+  std::shared_ptr<ThreadFactory> getThreadFactory() {
     return threadFactory_;
   }
 
@@ -129,7 +129,8 @@ class ThreadPoolExecutor : public virtual folly::Executor {
 
   struct TaskStatsCallbackRegistry;
 
-  struct FOLLY_ALIGN_TO_AVOID_FALSE_SHARING Thread : public ThreadHandle {
+  struct alignas(hardware_destructive_interference_size) Thread
+      : public ThreadHandle {
     explicit Thread(ThreadPoolExecutor* pool)
         : id(nextId++),
           handle(),