From 05a56e4c1e3313f38f4f891a0b8db684004555e1 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Sat, 4 Nov 2017 21:34:13 -0700 Subject: [PATCH] Move folly/Functional.h Summary: [Folly] Move `folly/Functional.h` to `folly/lang/RValueReferenceWrapper.h`. Reviewed By: Orvid Differential Revision: D6242160 fbshipit-source-id: a8ec42106cfe0ea617c87d382694d5eb2f0f61a0 --- folly/Makefile.am | 2 +- folly/container/Iterator.h | 2 +- folly/{Functional.h => lang/RValueReferenceWrapper.h} | 0 .../test/RValueReferenceWrapperTest.cpp} | 2 +- folly/test/Makefile.am | 8 ++++---- 5 files changed, 7 insertions(+), 7 deletions(-) rename folly/{Functional.h => lang/RValueReferenceWrapper.h} (100%) rename folly/{test/FunctionalTest.cpp => lang/test/RValueReferenceWrapperTest.cpp} (98%) diff --git a/folly/Makefile.am b/folly/Makefile.am index e1c0e464..37f95d1c 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -314,6 +314,7 @@ nobase_follyinclude_HEADERS = \ json.h \ lang/Assume.h \ lang/Launder.h \ + lang/RValueReferenceWrapper.h \ lang/SafeAssert.h \ Lazy.h \ LifoSem.h \ @@ -453,7 +454,6 @@ nobase_follyinclude_HEADERS = \ Try.h \ Unicode.h \ Function.h \ - Functional.h \ UncaughtExceptions.h \ Unit.h \ Uri.h \ diff --git a/folly/container/Iterator.h b/folly/container/Iterator.h index 1c316950..7db1136e 100644 --- a/folly/container/Iterator.h +++ b/folly/container/Iterator.h @@ -23,7 +23,7 @@ #include #include -#include +#include namespace folly { diff --git a/folly/Functional.h b/folly/lang/RValueReferenceWrapper.h similarity index 100% rename from folly/Functional.h rename to folly/lang/RValueReferenceWrapper.h diff --git a/folly/test/FunctionalTest.cpp b/folly/lang/test/RValueReferenceWrapperTest.cpp similarity index 98% rename from folly/test/FunctionalTest.cpp rename to folly/lang/test/RValueReferenceWrapperTest.cpp index f8a81f1b..7f44aa77 100644 --- a/folly/test/FunctionalTest.cpp +++ b/folly/lang/test/RValueReferenceWrapperTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include TEST(RvalueReferenceWrapper, MoveAndConvert) { diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index e5da5010..4bf6b29d 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -328,10 +328,10 @@ function_test_SOURCES = \ function_test_LDADD = libfollytestmain.la TESTS += function_test -functional_test_SOURCES = \ - FunctionalTest.cpp -functional_test_LDADD = libfollytestmain.la -TESTS += functional_test +rvalue_reference_wrapper_test_SOURCES = \ + ../lang/RValueReferenceWrapperTest.cpp +rvalue_reference_wrapper_test_LDADD = libfollytestmain.la +TESTS += rvalue_reference_wrapper_test ssl_test_SOURCES = \ ../ssl/test/OpenSSLHashTest.cpp -- 2.34.1