From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Mon, 28 Aug 2017 08:29:16 +0000 (-0700)
Subject: Shrink MicroSpinLock.h transitive includes and inline methods
X-Git-Tag: v2017.09.04.00~20
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=053fb02511ed385754f32987baa616221125036f;p=folly.git

Shrink MicroSpinLock.h transitive includes and inline methods

Summary: [Folly] Shrink `MicroSpinLock.h` transitive includes and inline methods.

Reviewed By: Orvid

Differential Revision: D5714883

fbshipit-source-id: 1744685ff9fa8d3620aef2545c8fe3ebc481df06
---

diff --git a/folly/MicroSpinLock.h b/folly/MicroSpinLock.h
index ee2c4420..7acf216f 100644
--- a/folly/MicroSpinLock.h
+++ b/folly/MicroSpinLock.h
@@ -39,17 +39,18 @@
 
 #include <array>
 #include <atomic>
-#include <cinttypes>
-#include <cstdlib>
-#include <mutex>
+#include <cassert>
+#include <cstdint>
 #include <type_traits>
 
-#include <boost/noncopyable.hpp>
-#include <glog/logging.h>
-
 #include <folly/Portability.h>
 #include <folly/detail/Sleeper.h>
 
+FOLLY_NAMESPACE_STD_BEGIN
+template <class Mutex>
+class lock_guard;
+FOLLY_NAMESPACE_STD_END
+
 namespace folly {
 
 /*
@@ -86,11 +87,11 @@ struct MicroSpinLock {
         sleeper.wait();
       }
     } while (!try_lock());
-    DCHECK(payload()->load() == LOCKED);
+    assert(payload()->load() == LOCKED);
   }
 
   void unlock() {
-    CHECK(payload()->load() == LOCKED);
+    assert(payload()->load() == LOCKED);
     payload()->store(FREE, std::memory_order_release);
   }
 
diff --git a/folly/detail/Sleeper.h b/folly/detail/Sleeper.h
index c2efad00..2d1f2487 100644
--- a/folly/detail/Sleeper.h
+++ b/folly/detail/Sleeper.h
@@ -21,7 +21,7 @@
  * @author Jordan DeLong <delong.j@fb.com>
  */
 
-#include <cinttypes>
+#include <cstdint>
 
 #include <folly/portability/Asm.h>
 #include <folly/portability/Time.h>