Register singleton's destruction using std::atexit

[folly.git] / folly / CachelinePadded.h

diff --git a/folly/CachelinePadded.h b/folly/CachelinePadded.h
index cf10ecb7a8baadf63f1a046983f45051f3314b99..27a06b4a917bbd96b1dcd9e16bf34616b9fb92ae 100644 (file)
--- a/folly/CachelinePadded.h
+++ b/folly/CachelinePadded.h
@@ -17,9 +17,8 @@
 #pragma once
 
 #include <cstddef>
+#include <utility>
 
-#include <folly/Portability.h>
-#include <folly/concurrency/CacheLocality.h>
 #include <folly/lang/Align.h>
 
 namespace folly {
@@ -68,8 +67,8 @@ class CachelinePadded {
 
  private:
   static constexpr size_t paddingSize() noexcept {
-    return CacheLocality::kFalseSharingRange -
-        (alignof(T) % CacheLocality::kFalseSharingRange);
+    return hardware_destructive_interference_size -
+        (alignof(T) % hardware_destructive_interference_size);
   }
   char paddingPre_[paddingSize()];
   T inner_;