From bfa61031d36f41aaa907d40371c28ac0e84c8e0d Mon Sep 17 00:00:00 2001
From: James Sedgwick <jsedgwick@fb.com>
Date: Thu, 19 Oct 2017 07:45:51 -0700
Subject: [PATCH] move ApplyTuple to functional/

Summary: as above

Reviewed By: yfeldblum

Differential Revision: D6086563

fbshipit-source-id: ab7f50ba46ebd1dbef6438f956258b2fbb13cb5c
---
 CMakeLists.txt                                 | 4 +++-
 folly/Hash.h                                   | 2 +-
 folly/Makefile.am                              | 3 +--
 folly/{ => functional}/ApplyTuple.h            | 0
 folly/functional/Partial.h                     | 2 +-
 folly/{ => functional}/test/ApplyTupleTest.cpp | 2 +-
 folly/gen/test/StringTest.cpp                  | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)
 rename folly/{ => functional}/ApplyTuple.h (100%)
 rename folly/{ => functional}/test/ApplyTupleTest.cpp (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdc992a8..68fdc288 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -358,6 +358,9 @@ if (BUILD_TESTS)
     DIRECTORY fibers/test/
       TEST fibers_test SOURCES FibersTest.cpp
 
+    DIRECTORY functional/test/
+      TEST apply_tuple_test SOURCES ApplyTupleTest.cpp
+
     DIRECTORY futures/test/
       TEST barrier_test SOURCES BarrierTest.cpp
       TEST callback_lifetime_test SOURCES CallbackLifetimeTest.cpp
@@ -474,7 +477,6 @@ if (BUILD_TESTS)
 
     DIRECTORY test/
       TEST ahm_int_stress_test SOURCES AHMIntStressTest.cpp
-      TEST apply_tuple_test SOURCES ApplyTupleTest.cpp
       TEST arena_test SOURCES ArenaTest.cpp
       TEST arena_smartptr_test SOURCES ArenaSmartPtrTest.cpp
       TEST array_test SOURCES ArrayTest.cpp
diff --git a/folly/Hash.h b/folly/Hash.h
index 410d2720..5253975a 100644
--- a/folly/Hash.h
+++ b/folly/Hash.h
@@ -24,8 +24,8 @@
 #include <type_traits>
 #include <utility>
 
-#include <folly/ApplyTuple.h>
 #include <folly/Bits.h>
+#include <folly/functional/ApplyTuple.h>
 #include <folly/hash/SpookyHashV1.h>
 #include <folly/hash/SpookyHashV2.h>
 
diff --git a/folly/Makefile.am b/folly/Makefile.am
index ce29ac05..0b48eab2 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -27,7 +27,6 @@ lib_LTLIBRARIES = \
 follyincludedir = $(includedir)/folly
 
 nobase_follyinclude_HEADERS = \
-	ApplyTuple.h \
 	Arena.h \
 	Arena-inl.h \
 	Array.h \
@@ -106,7 +105,7 @@ nobase_follyinclude_HEADERS = \
 	executors/ThreadPoolExecutor.h \
 	executors/ThreadedExecutor.h \
 	executors/UnboundedBlockingQueue.h \
-	executors/QueuedImmediateExecutor.h \
+	functional/ApplyTuple.h \
 	Demangle.h \
 	DiscriminatedPtr.h \
 	DynamicConverter.h \
diff --git a/folly/ApplyTuple.h b/folly/functional/ApplyTuple.h
similarity index 100%
rename from folly/ApplyTuple.h
rename to folly/functional/ApplyTuple.h
diff --git a/folly/functional/Partial.h b/folly/functional/Partial.h
index b3914528..650a394c 100644
--- a/folly/functional/Partial.h
+++ b/folly/functional/Partial.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/ApplyTuple.h>
+#include <folly/functional/ApplyTuple.h>
 
 namespace folly {
 
diff --git a/folly/test/ApplyTupleTest.cpp b/folly/functional/test/ApplyTupleTest.cpp
similarity index 99%
rename from folly/test/ApplyTupleTest.cpp
rename to folly/functional/test/ApplyTupleTest.cpp
index a09f8074..e661e479 100644
--- a/folly/test/ApplyTupleTest.cpp
+++ b/folly/functional/test/ApplyTupleTest.cpp
@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include <folly/ApplyTuple.h>
+#include <folly/functional/ApplyTuple.h>
 #include <folly/portability/GTest.h>
 
 #include <array>
diff --git a/folly/gen/test/StringTest.cpp b/folly/gen/test/StringTest.cpp
index 47d76d2b..8db23ccc 100644
--- a/folly/gen/test/StringTest.cpp
+++ b/folly/gen/test/StringTest.cpp
@@ -18,7 +18,7 @@
 #include <map>
 #include <vector>
 
-#include <folly/ApplyTuple.h>
+#include <folly/functional/ApplyTuple.h>
 #include <folly/gen/String.h>
 #include <folly/portability/GTest.h>
 
-- 
2.34.1