Remove LockTraitsBoost from Synchronized.h

Summary:
Update Synchronized.h to no longer include LockTraitsBoost.h
Callers that want to use folly::Synchronized with a boost lock type will now
need to explicitly include LockTraitsBoost.h on their own.

Reviewed By: yfeldblum

Differential Revision: D3521168

fbshipit-source-id: 08f0041f51fe2e9566bde58e9f039a6d187b54e3

diff --git a/folly/Synchronized.h b/folly/Synchronized.h
index 3d40280bd315b813c243326df14b78be9683b551..87e293eb415baaa7e9870ca71ec17aabccc1b3e0 100644 (file)
--- a/folly/Synchronized.h
+++ b/folly/Synchronized.h
@@ -23,9 +23,7 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <boost/thread.hpp>

 #include <folly/LockTraits.h>
 #include <folly/LockTraits.h>

-#include <folly/LockTraitsBoost.h>

 #include <folly/Preprocessor.h>
 #include <folly/SharedMutex.h>
 #include <folly/Traits.h>
 #include <folly/Preprocessor.h>
 #include <folly/SharedMutex.h>
 #include <folly/Traits.h>

diff --git a/folly/fibers/GuardPageAllocator.cpp b/folly/fibers/GuardPageAllocator.cpp
index 96595946f197366ed3ae7704944ce9a4070194db..9802fe9b3433563b6ee4ee44f8dde565ef3d3da3 100644 (file)
--- a/folly/fibers/GuardPageAllocator.cpp
+++ b/folly/fibers/GuardPageAllocator.cpp
@@ -20,6 +20,7 @@
 #endif
 #include <signal.h>
 
 #endif
 #include <signal.h>
 

+#include <iostream>

 #include <mutex>
 
 #include <folly/Singleton.h>
 #include <mutex>
 
 #include <folly/Singleton.h>

diff --git a/folly/test/SynchronizedTest.cpp b/folly/test/SynchronizedTest.cpp
index 3c80c192494bb9fe5c3b5a8961574a1e5b64865d..29a8d031592951156b552c4ca029145293824a65 100644 (file)
--- a/folly/test/SynchronizedTest.cpp
+++ b/folly/test/SynchronizedTest.cpp
@@ -18,6 +18,7 @@
 
 // Test bed for folly/Synchronized.h
 
 
 // Test bed for folly/Synchronized.h
 

+#include <folly/LockTraitsBoost.h>

 #include <folly/Portability.h>
 #include <folly/RWSpinLock.h>
 #include <folly/SharedMutex.h>
 #include <folly/Portability.h>
 #include <folly/RWSpinLock.h>
 #include <folly/SharedMutex.h>

diff --git a/folly/test/SynchronizedTestLib-inl.h b/folly/test/SynchronizedTestLib-inl.h
index 1517730ea6f0db6e06deb17e6b106d2ffcae5944..c289ab4df58f4a783eac9a6e56808660c6659c95 100644 (file)
--- a/folly/test/SynchronizedTestLib-inl.h
+++ b/folly/test/SynchronizedTestLib-inl.h
@@ -18,16 +18,16 @@
 
 #include <gtest/gtest.h>
 
 
 #include <gtest/gtest.h>
 

+#include <folly/Foreach.h>
+#include <folly/Random.h>
+#include <folly/Synchronized.h>
+#include <glog/logging.h>

 #include <algorithm>
 #include <algorithm>

-#include <random>

 #include <functional>
 #include <functional>

+#include <map>
+#include <random>

 #include <thread>
 #include <vector>
 #include <thread>
 #include <vector>

-#include <glog/logging.h>
-#include <folly/Foreach.h>
-#include <folly/Random.h>
-#include <folly/Synchronized.h>
-

 
 inline std::mt19937& getRNG() {
   static const auto seed = folly::randomNumberSeed();
 
 inline std::mt19937& getRNG() {
   static const auto seed = folly::randomNumberSeed();