Commit 483f9bc6 authored by Alfred Fuller's avatar Alfred Fuller Committed by Facebook GitHub Bot

Fix include order and grouping in folly - 6/13

Summary: All changes were automated

Reviewed By: Orvid

Differential Revision: D25507540

fbshipit-source-id: 71279e19ddad29622c14729d73f5d0d45f0ba410
parent 36acaed4
......@@ -19,19 +19,19 @@
#ifndef _WIN32
#include <dlfcn.h>
#endif
#include <csignal>
#include <csignal>
#include <iostream>
#include <mutex>
#include <glog/logging.h>
#include <folly/Singleton.h>
#include <folly/SpinLock.h>
#include <folly/Synchronized.h>
#include <folly/portability/SysMman.h>
#include <folly/portability/Unistd.h>
#include <glog/logging.h>
namespace folly {
namespace fibers {
......
......@@ -20,7 +20,6 @@
#include <folly/Function.h>
#include <folly/Likely.h>
#include <folly/fibers/FiberManager.h>
#include <folly/fibers/LoopController.h>
......
......@@ -15,7 +15,6 @@
*/
#include <folly/Optional.h>
#include <folly/fibers/FiberManagerInternal.h>
#include <folly/fibers/ForEach.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/fibers/async/Async.h>
#include <folly/fibers/FiberManagerInternal.h>
namespace folly {
......
......@@ -16,12 +16,14 @@
#pragma once
#include <utility>
#include <glog/logging.h>
#include <folly/Traits.h>
#include <folly/Unit.h>
#include <folly/functional/Invoke.h>
#include <folly/lang/CustomizationPoint.h>
#include <glog/logging.h>
#include <utility>
namespace folly {
namespace fibers {
......
......@@ -16,10 +16,12 @@
#pragma once
#include <utility>
#include <glog/logging.h>
#include <folly/fibers/Baton.h>
#include <folly/fibers/async/Async.h>
#include <glog/logging.h>
#include <utility>
namespace folly {
namespace fibers {
......
......@@ -14,6 +14,11 @@
* limitations under the License.
*/
#pragma once
#include <algorithm>
#include <vector>
#include <folly/Traits.h>
#include <folly/Try.h>
#include <folly/fibers/FiberManager.h>
......@@ -23,10 +28,6 @@
#include <folly/fibers/async/Future.h>
#include <folly/functional/Invoke.h>
#include <algorithm>
#include <vector>
#pragma once
namespace folly {
namespace fibers {
namespace async {
......
......@@ -14,12 +14,10 @@
* limitations under the License.
*/
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
#include <folly/fibers/async/Async.h>
#include <folly/fibers/FiberManager.h>
#include <folly/fibers/FiberManagerMap.h>
#include <folly/fibers/async/Async.h>
#include <folly/fibers/async/Baton.h>
#include <folly/fibers/async/Collect.h>
#include <folly/fibers/async/FiberManager.h>
......@@ -27,6 +25,8 @@
#include <folly/fibers/async/Promise.h>
#include <folly/fibers/async/WaitUtils.h>
#include <folly/io/async/EventBase.h>
#include <folly/portability/GMock.h>
#include <folly/portability/GTest.h>
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/Sleep.h>
......
......@@ -15,6 +15,7 @@
*/
#include <folly/fibers/detail/AtomicBatchDispatcher.h>
#include <folly/Format.h>
namespace folly {
......
......@@ -14,12 +14,11 @@
* limitations under the License.
*/
#include <folly/fibers/FiberManager.h>
#include <folly/fibers/FiberManagerMap.h>
#include <queue>
#include <folly/Benchmark.h>
#include <folly/fibers/FiberManager.h>
#include <folly/fibers/FiberManagerMap.h>
#include <folly/fibers/SimpleLoopController.h>
#include <folly/init/Init.h>
#include <folly/io/async/EventBase.h>
......
......@@ -19,11 +19,9 @@
#include <thread>
#include <vector>
#include <folly/Conv.h>
#include <folly/Memory.h>
#include <folly/Random.h>
#include <folly/futures/Future.h>
#include <folly/Conv.h>
#include <folly/executors/CPUThreadPoolExecutor.h>
#include <folly/fibers/AddTasks.h>
#include <folly/fibers/AtomicBatchDispatcher.h>
......@@ -38,6 +36,7 @@
#include <folly/fibers/SimpleLoopController.h>
#include <folly/fibers/TimedMutex.h>
#include <folly/fibers/WhenN.h>
#include <folly/futures/Future.h>
#include <folly/io/async/ScopedEventBaseThread.h>
#include <folly/portability/GTest.h>
#include <folly/tracing/AsyncStack.h>
......
......@@ -18,7 +18,6 @@
#include <queue>
#include <folly/Memory.h>
#include <folly/fibers/FiberManager.h>
#include <folly/fibers/SimpleLoopController.h>
......
......@@ -16,12 +16,12 @@
#pragma once
#include <folly/Utility.h>
#include <folly/functional/Invoke.h>
#include <tuple>
#include <utility>
#include <folly/Utility.h>
#include <folly/functional/Invoke.h>
namespace folly {
namespace detail {
......
......@@ -14,16 +14,16 @@
* limitations under the License.
*/
#include <iostream>
#include <folly/Overload.h>
#include <folly/functional/ApplyTuple.h>
#include <folly/portability/GTest.h>
#include <array>
#include <iostream>
#include <memory>
#include <utility>
#include <folly/Overload.h>
#include <folly/portability/GTest.h>
namespace {
void func(int a, int b, double c) {
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <folly/functional/Partial.h>
#include <memory>
#include <folly/Function.h>
#include <folly/functional/Partial.h>
#include <folly/portability/GTest.h>
using folly::partial;
......
......@@ -15,10 +15,11 @@
*/
#include <folly/futures/Barrier.h>
#include <folly/lang/Exception.h>
#include <glog/logging.h>
#include <folly/lang/Exception.h>
namespace folly {
namespace futures {
......
......@@ -15,6 +15,7 @@
*/
#include <folly/futures/Future.h>
#include <folly/Likely.h>
#include <folly/futures/ThreadWheelTimekeeper.h>
......
......@@ -40,8 +40,9 @@
#include <folly/lang/Exception.h>
#if FOLLY_HAS_COROUTINES
#include <folly/experimental/coro/Traits.h>
#include <experimental/coroutine>
#include <folly/experimental/coro/Traits.h>
#endif
// boring predeclarations and details
......
......@@ -16,13 +16,13 @@
#pragma once
#include <chrono>
#include <map>
#include <folly/Synchronized.h>
#include <folly/futures/Future.h>
#include <folly/futures/Promise.h>
#include <chrono>
#include <map>
namespace folly {
// Manually controlled Timekeeper for unit testing.
......
......@@ -15,12 +15,13 @@
*/
#include <folly/futures/ThreadWheelTimekeeper.h>
#include <folly/futures/WTCallback.h>
#include <future>
#include <folly/Chrono.h>
#include <folly/Singleton.h>
#include <folly/futures/Future.h>
#include <future>
#include <folly/futures/WTCallback.h>
namespace folly {
......
......@@ -16,10 +16,11 @@
#pragma once
#include <thread>
#include <folly/futures/Future.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/HHWheelTimer.h>
#include <thread>
namespace folly {
......
......@@ -16,11 +16,12 @@
#pragma once
#include <future>
#include <folly/Chrono.h>
#include <folly/futures/Future.h>
#include <folly/io/async/EventBase.h>
#include <folly/io/async/HHWheelTimer.h>
#include <future>
namespace folly {
// Our Callback object for HHWheelTimer
......
......@@ -14,9 +14,10 @@
* limitations under the License.
*/
#include <folly/futures/detail/Core.h>
#include <new>
#include <folly/futures/detail/Core.h>
#include <folly/lang/Assume.h>
namespace folly {
......
......@@ -22,6 +22,8 @@
#include <utility>
#include <vector>
#include <glog/logging.h>
#include <folly/Executor.h>
#include <folly/Function.h>
#include <folly/Optional.h>
......@@ -29,13 +31,11 @@
#include <folly/Try.h>
#include <folly/Utility.h>
#include <folly/futures/detail/Types.h>
#include <folly/io/async/Request.h>
#include <folly/lang/Assume.h>
#include <folly/lang/Exception.h>
#include <folly/synchronization/AtomicUtil.h>
#include <folly/synchronization/MicroSpinLock.h>
#include <glog/logging.h>
#include <folly/io/async/Request.h>
namespace folly {
namespace futures {
......
......@@ -20,11 +20,11 @@
#include <condition_variable>
#include <mutex>
#include <glog/logging.h>
#include <folly/Random.h>
#include <folly/portability/GTest.h>
#include <glog/logging.h>
namespace folly {
namespace futures {
namespace test {
......
......@@ -15,6 +15,9 @@
*/
#include <folly/Benchmark.h>
#include <vector>
#include <folly/executors/InlineExecutor.h>
#include <folly/futures/Future.h>
#include <folly/futures/Promise.h>
......@@ -23,8 +26,6 @@
#include <folly/portability/Semaphore.h>
#include <folly/synchronization/Baton.h>
#include <vector>
using namespace folly;
namespace {
......
......@@ -14,10 +14,9 @@
* limitations under the License.
*/
#include <folly/futures/Future.h>
#include <thread>
#include <folly/futures/Future.h>
#include <folly/futures/test/TestExecutor.h>
#include <folly/portability/GTest.h>
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <memory>
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
#include <memory>
using namespace folly;
class TestData : public RequestData {
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <thread>
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
#include <thread>
using namespace folly;
namespace {
......
......@@ -15,6 +15,7 @@
*/
#include <folly/futures/detail/Core.h>
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
......
......@@ -15,13 +15,6 @@
*/
#include <folly/futures/Future.h>
#include <folly/Executor.h>
#include <folly/Memory.h>
#include <folly/Unit.h>
#include <folly/dynamic.h>
#include <folly/executors/ManualExecutor.h>
#include <folly/portability/GTest.h>
#include <folly/synchronization/Baton.h>
#include <algorithm>
#include <atomic>
......@@ -32,6 +25,14 @@
#include <thread>
#include <type_traits>
#include <folly/Executor.h>
#include <folly/Memory.h>
#include <folly/Unit.h>
#include <folly/dynamic.h>
#include <folly/executors/ManualExecutor.h>
#include <folly/portability/GTest.h>
#include <folly/synchronization/Baton.h>
using namespace folly;
#define EXPECT_TYPE(x, T) EXPECT_TRUE((std::is_same<decltype(x), T>::value))
......
......@@ -16,10 +16,10 @@
#include <folly/futures/ManualTimekeeper.h>
#include <folly/portability/GTest.h>
#include <chrono>
#include <folly/portability/GTest.h>
using namespace std::literals;
namespace folly {
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <memory>
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
#include <memory>
using namespace folly;
using std::string;
......
......@@ -14,11 +14,12 @@
* limitations under the License.
*/
#include <folly/futures/Retrying.h>
#include <algorithm>
#include <atomic>
#include <vector>
#include <folly/futures/Retrying.h>
#include <folly/futures/test/TestExecutor.h>
#include <folly/portability/GTest.h>
#include <folly/portability/SysResource.h>
......
......@@ -14,6 +14,15 @@
* limitations under the License.
*/
#include <algorithm>
#include <atomic>
#include <future>
#include <memory>
#include <numeric>
#include <string>
#include <thread>
#include <type_traits>
#include <folly/Executor.h>
#include <folly/Memory.h>
#include <folly/Unit.h>
......@@ -24,15 +33,6 @@
#include <folly/portability/GTest.h>
#include <folly/synchronization/Baton.h>
#include <algorithm>
#include <atomic>
#include <future>
#include <memory>
#include <numeric>
#include <string>
#include <thread>
#include <type_traits>
using namespace folly;
#define EXPECT_TYPE(x, T) EXPECT_TRUE((std::is_same<decltype(x), T>::value))
......
......@@ -15,6 +15,7 @@
*/
#include <folly/futures/SharedPromise.h>
#include <folly/portability/GTest.h>
using namespace folly;
......
......@@ -15,6 +15,7 @@
*/
#include <folly/futures/test/TestExecutor.h>
#include <folly/portability/GTest.h>
using namespace std;
......
......@@ -16,11 +16,11 @@
#pragma once
#include <memory>
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
#include <memory>
namespace folly {
typedef std::unique_ptr<int> A;
......
......@@ -14,11 +14,11 @@
* limitations under the License.
*/
#include <thread>
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
#include <thread>
using namespace folly;
namespace {
......
......@@ -14,6 +14,8 @@
* limitations under the License.
*/
#include <vector>
#include <boost/thread/barrier.hpp>
#include <folly/Conv.h>
......@@ -21,8 +23,6 @@
#include <folly/futures/Future.h>
#include <folly/portability/GTest.h>
#include <vector>
using namespace folly;
typedef FutureException eggs_t;
......
......@@ -18,13 +18,14 @@
#error This file may only be included from folly/gen/Parallel.h
#endif
#include <folly/MPMCQueue.h>
#include <folly/ScopeGuard.h>
#include <folly/experimental/EventCount.h>
#include <atomic>
#include <thread>
#include <vector>
#include <folly/MPMCQueue.h>
#include <folly/ScopeGuard.h>
#include <folly/experimental/EventCount.h>
namespace folly {
namespace gen {
namespace detail {
......
......@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <glog/logging.h>
#include <folly/gen/Base.h>
#include <iosfwd>
#include <memory>
......@@ -22,13 +22,14 @@
#include <set>
#include <vector>
#include <glog/logging.h>
#include <folly/FBVector.h>
#include <folly/MapUtil.h>
#include <folly/Memory.h>
#include <folly/String.h>
#include <folly/dynamic.h>
#include <folly/experimental/TestUtil.h>
#include <folly/gen/Base.h>
#include <folly/portability/GFlags.h>
#include <folly/portability/GTest.h>
......
......@@ -14,6 +14,8 @@
* limitations under the License.
*/
#include <folly/gen/Combine.h>
#include <memory>
#include <string>
#include <tuple>
......@@ -24,7 +26,6 @@
#include <folly/FBVector.h>
#include <folly/Range.h>
#include <folly/gen/Base.h>
#include <folly/gen/Combine.h>
#include <folly/portability/GFlags.h>
#include <folly/portability/GTest.h>
......
......@@ -14,10 +14,11 @@
* limitations under the License.
*/
#include <folly/File.h>
#include <string>
#include <vector>
#include <folly/File.h>
#include <folly/Range.h>
#include <folly/container/Array.h>
#include <folly/experimental/TestUtil.h>
......
......@@ -14,13 +14,14 @@
* limitations under the License.
*/
#include <folly/gen/ParallelMap.h>
#include <vector>
#include <glog/logging.h>
#include <folly/Memory.h>
#include <folly/gen/Base.h>
#include <folly/gen/ParallelMap.h>
#include <folly/portability/GFlags.h>
#include <folly/portability/GTest.h>
......
......@@ -14,6 +14,8 @@
* limitations under the License.
*/
#include <folly/gen/Parallel.h>
#include <array>
#include <iostream>
#include <memory>
......@@ -22,7 +24,6 @@
#include <glog/logging.h>
#include <folly/gen/Base.h>
#include <folly/gen/Parallel.h>
#include <folly/portability/GFlags.h>
#include <folly/portability/GTest.h>
......
......@@ -14,12 +14,13 @@
* limitations under the License.
*/
#include <folly/gen/String.h>
#include <iosfwd>
#include <map>
#include <vector>
#include <folly/functional/ApplyTuple.h>
#include <folly/gen/String.h>
#include <folly/portability/GTest.h>
using namespace folly::gen;
......
......@@ -15,11 +15,14 @@
*/
#include <folly/hash/Checksum.h>
#include <algorithm>
#include <stdexcept>
#include <boost/crc.hpp>
#include <folly/CpuId.h>
#include <folly/hash/detail/ChecksumDetail.h>
#include <algorithm>
#include <stdexcept>
#if FOLLY_SSE_PREREQ(4, 2)
#include <emmintrin.h>
......
......@@ -17,6 +17,7 @@
#pragma once
#include <stdint.h>
#include <cstddef>
/*
......
......@@ -26,10 +26,10 @@
#include <folly/hash/SpookyHashV1.h>
#include <folly/CppAttributes.h>
#include <cstring>
#include <folly/CppAttributes.h>
#define ALLOW_UNALIGNED_READS 1
namespace folly {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment