From e89f46cd508ae85a0d0917119f5a73651e9af1b2 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Sat, 28 Oct 2017 11:31:23 -0700 Subject: [PATCH] Move folly/detail/AtomicUtils.h Summary: [Folly] Move `folly/detail/AtomicUtils.h` to `folly/synchronization/detail/`. Reviewed By: Orvid Differential Revision: D6180482 fbshipit-source-id: 5671c149a59eea824db2935ffabcf85a2f78b690 --- folly/AtomicStruct.h | 2 +- folly/Makefile.am | 2 +- folly/concurrency/AtomicSharedPtr.h | 2 +- folly/{ => synchronization}/detail/AtomicUtils.h | 0 folly/test/DeterministicSchedule.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename folly/{ => synchronization}/detail/AtomicUtils.h (100%) diff --git a/folly/AtomicStruct.h b/folly/AtomicStruct.h index e3297604..a774d315 100644 --- a/folly/AtomicStruct.h +++ b/folly/AtomicStruct.h @@ -17,7 +17,7 @@ #pragma once #include -#include +#include #include #include #include diff --git a/folly/Makefile.am b/folly/Makefile.am index bb515379..f2b89b7e 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -67,7 +67,6 @@ nobase_follyinclude_HEADERS = \ ConstexprMath.h \ detail/AtomicHashUtils.h \ detail/AtomicUnorderedMapUtils.h \ - detail/AtomicUtils.h \ detail/BitIteratorDetail.h \ detail/DiscriminatedPtrDetail.h \ detail/FileUtilDetail.h \ @@ -418,6 +417,7 @@ nobase_follyinclude_HEADERS = \ stats/TimeseriesHistogram-defs.h \ stats/TimeseriesHistogram.h \ synchronization/CallOnce.h \ + synchronization/detail/AtomicUtils.h \ system/MemoryMapping.h \ system/Shell.h \ system/ThreadId.h \ diff --git a/folly/concurrency/AtomicSharedPtr.h b/folly/concurrency/AtomicSharedPtr.h index bd400d3c..d1b2aa7a 100644 --- a/folly/concurrency/AtomicSharedPtr.h +++ b/folly/concurrency/AtomicSharedPtr.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/folly/detail/AtomicUtils.h b/folly/synchronization/detail/AtomicUtils.h similarity index 100% rename from folly/detail/AtomicUtils.h rename to folly/synchronization/detail/AtomicUtils.h diff --git a/folly/test/DeterministicSchedule.h b/folly/test/DeterministicSchedule.h index 0f243d36..d085dcb0 100644 --- a/folly/test/DeterministicSchedule.h +++ b/folly/test/DeterministicSchedule.h @@ -29,9 +29,9 @@ #include #include -#include #include #include +#include namespace folly { namespace test { -- 2.34.1