Revert D5714883: [Folly] Shrink MicroSpinLock.h transitive includes and inline methods

Summary:
This reverts commit 1744685ff9fa8d3620aef2545c8fe3ebc481df06

bypass-lint

Differential Revision: D5714883

fbshipit-source-id: 0cdb5f2cac095a9202cb1310ff8e75e75b4afd74

diff --git a/folly/MicroSpinLock.h b/folly/MicroSpinLock.h
index 7acf216f70b5a5468ba3d991f33236d5cce2f2cb..ee2c4420f62a33953d68d94885708ece6cddfe0b 100644 (file)
--- a/folly/MicroSpinLock.h
+++ b/folly/MicroSpinLock.h
@@ -39,18 +39,17 @@
 
 #include <array>
 #include <atomic>
-#include <cassert>
-#include <cstdint>
+#include <cinttypes>
+#include <cstdlib>
+#include <mutex>
 #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 {
 
 /*
@@ -87,11 +86,11 @@ struct MicroSpinLock {
         sleeper.wait();
       }
     } while (!try_lock());
-    assert(payload()->load() == LOCKED);
+    DCHECK(payload()->load() == LOCKED);
   }
 
   void unlock() {
-    assert(payload()->load() == LOCKED);
+    CHECK(payload()->load() == LOCKED);
     payload()->store(FREE, std::memory_order_release);
   }
 

diff --git a/folly/detail/Sleeper.h b/folly/detail/Sleeper.h
index 2d1f24874b27ef33e1fd6171226a48b8e8dfba15..c2efad002098bbf1e018edd5f83e1f094a538af7 100644 (file)
--- a/folly/detail/Sleeper.h
+++ b/folly/detail/Sleeper.h
@@ -21,7 +21,7 @@
  * @author Jordan DeLong <delong.j@fb.com>
  */
 
-#include <cstdint>
+#include <cinttypes>
 
 #include <folly/portability/Asm.h>
 #include <folly/portability/Time.h>