From 49e4875c1e7d55df5913410539d299b7aa3c62bc Mon Sep 17 00:00:00 2001
From: Michael Lee <mzlee@fb.com>
Date: Mon, 21 Dec 2015 07:55:45 -0800
Subject: [PATCH] Move ThreadLocal.h into the implementation

Summary: Move ThreadLocal.h out of Random.h so we don't over include.

Reviewed By: yfeldblum

Differential Revision: D2770085

fb-gh-sync-id: e6934d606236c2b5cdde728639f372641ee716dc
---
 folly/Random-inl.h               | 2 ++
 folly/Random.cpp                 | 1 +
 folly/Random.h                   | 2 +-
 folly/test/FBVectorBenchmark.cpp | 1 +
 folly/test/FBVectorTest.cpp      | 1 +
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/folly/Random-inl.h b/folly/Random-inl.h
index f3b0433b..a4baa958 100644
--- a/folly/Random-inl.h
+++ b/folly/Random-inl.h
@@ -18,6 +18,8 @@
 #error This file may only be included from folly/Random.h
 #endif
 
+#include <array>
+
 namespace folly {
 
 namespace detail {
diff --git a/folly/Random.cpp b/folly/Random.cpp
index 899668c8..d1584f11 100644
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -26,6 +26,7 @@
 #include <glog/logging.h>
 #include <folly/File.h>
 #include <folly/FileUtil.h>
+#include <folly/ThreadLocal.h>
 
 #ifdef _MSC_VER
 # include <wincrypt.h>
diff --git a/folly/Random.h b/folly/Random.h
index 552eccd2..13bb2c42 100644
--- a/folly/Random.h
+++ b/folly/Random.h
@@ -20,7 +20,7 @@
 #include <type_traits>
 #include <random>
 #include <stdint.h>
-#include <folly/ThreadLocal.h>
+#include <folly/Portability.h>
 
 #if FOLLY_HAVE_EXTRANDOM_SFMT19937
 #include <ext/random>
diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index 6548c3f4..1803df61 100644
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -17,6 +17,7 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
+#include <folly/Foreach.h>
 #include <folly/Traits.h>
 #include <folly/Random.h>
 #include <folly/FBString.h>
diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp
index ae845834..ef3c6918 100644
--- a/folly/test/FBVectorTest.cpp
+++ b/folly/test/FBVectorTest.cpp
@@ -17,6 +17,7 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
+#include <folly/Foreach.h>
 #include <folly/Traits.h>
 #include <folly/Random.h>
 #include <folly/FBString.h>
-- 
2.34.1