From 8034b69f9c27a6acf87bb5d77c2a850365b15d0d Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Sun, 29 Oct 2017 03:33:14 -0700 Subject: [PATCH] Move folly/Launder.h Summary: [Folly] Move `folly/Launder.h` to `folly/lang/`. Reviewed By: luciang Differential Revision: D6182882 fbshipit-source-id: 97e46bd4e4d6f212d8234209ee90a41e7850ecb9 --- folly/Makefile.am | 2 +- folly/Optional.h | 2 +- folly/Replaceable.h | 2 +- folly/{ => lang}/Launder.h | 0 folly/{ => lang}/test/LaunderTest.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename folly/{ => lang}/Launder.h (100%) rename folly/{ => lang}/test/LaunderTest.cpp (96%) diff --git a/folly/Makefile.am b/folly/Makefile.am index a35a4a94..337b1cd6 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -313,7 +313,7 @@ nobase_follyinclude_HEADERS = \ io/async/test/Util.h \ json.h \ lang/Assume.h \ - Launder.h \ + lang/Launder.h \ Lazy.h \ LifoSem.h \ Likely.h \ diff --git a/folly/Optional.h b/folly/Optional.h index 39abcc1c..acd0b126 100644 --- a/folly/Optional.h +++ b/folly/Optional.h @@ -61,10 +61,10 @@ #include #include -#include #include #include #include +#include namespace folly { diff --git a/folly/Replaceable.h b/folly/Replaceable.h index b786f8e8..92d1ec6f 100644 --- a/folly/Replaceable.h +++ b/folly/Replaceable.h @@ -21,10 +21,10 @@ #include #include -#include #include #include #include +#include /** * An instance of `Replaceable` wraps an instance of `T`. diff --git a/folly/Launder.h b/folly/lang/Launder.h similarity index 100% rename from folly/Launder.h rename to folly/lang/Launder.h diff --git a/folly/test/LaunderTest.cpp b/folly/lang/test/LaunderTest.cpp similarity index 96% rename from folly/test/LaunderTest.cpp rename to folly/lang/test/LaunderTest.cpp index fb33c98a..df3b555d 100644 --- a/folly/test/LaunderTest.cpp +++ b/folly/lang/test/LaunderTest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include using namespace ::testing; -- 2.34.1