From d31633e632ce29818040fbfe30d49f3476a3a00a Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Thu, 12 Oct 2017 21:21:17 -0700
Subject: [PATCH] Move folly/Checksum.h into folly/hash/

Summary: [Folly] Move `folly/Checksum.h` into `folly/hash/`.

Reviewed By: Orvid

Differential Revision: D6045825

fbshipit-source-id: 02d3e6a49e2c0fc115cfee09e1186be7a13525ba
---
 folly/Makefile.am                          | 12 ++++++------
 folly/{ => hash}/Checksum.cpp              |  4 ++--
 folly/{ => hash}/Checksum.h                |  0
 folly/{ => hash}/detail/ChecksumDetail.cpp |  2 +-
 folly/{ => hash}/detail/ChecksumDetail.h   |  0
 folly/{ => hash}/detail/Crc32cDetail.cpp   |  2 +-
 folly/{ => hash}/test/ChecksumTest.cpp     |  4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
 rename folly/{ => hash}/Checksum.cpp (98%)
 rename folly/{ => hash}/Checksum.h (100%)
 rename folly/{ => hash}/detail/ChecksumDetail.cpp (99%)
 rename folly/{ => hash}/detail/ChecksumDetail.h (100%)
 rename folly/{ => hash}/detail/Crc32cDetail.cpp (99%)
 rename folly/{ => hash}/test/ChecksumTest.cpp (99%)

diff --git a/folly/Makefile.am b/folly/Makefile.am
index 90837eef..d56bd07b 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -46,7 +46,6 @@ nobase_follyinclude_HEADERS = \
 	Bits.h \
 	CachelinePadded.h \
 	CallOnce.h \
-	Checksum.h \
 	Chrono.h \
 	ClockGettimeWrappers.h \
 	ConcurrentSkipList.h \
@@ -66,7 +65,6 @@ nobase_follyinclude_HEADERS = \
 	detail/AtomicUnorderedMapUtils.h \
 	detail/AtomicUtils.h \
 	detail/BitIteratorDetail.h \
-	detail/ChecksumDetail.h \
 	detail/DiscriminatedPtrDetail.h \
 	detail/FileUtilDetail.h \
 	detail/FingerprintPolynomial.h \
@@ -226,6 +224,8 @@ nobase_follyinclude_HEADERS = \
 	futures/detail/FSM.h \
 	futures/detail/Types.h \
 	futures/test/TestExecutor.h \
+	hash/Checksum.h \
+	hash/detail/ChecksumDetail.h \
 	hash/SpookyHashV1.h \
 	hash/SpookyHashV2.h \
 	gen/Base.h \
@@ -467,9 +467,9 @@ GroupVarintTables.cpp: build/generate_varint_tables.py
 CLEANFILES += GroupVarintTables.cpp
 
 libfollybasesse42_la_SOURCES = \
-	detail/Crc32cDetail.cpp \
-	detail/ChecksumDetail.cpp \
-	detail/RangeSse42.cpp
+	detail/RangeSse42.cpp \
+	hash/detail/ChecksumDetail.cpp \
+	hash/detail/Crc32cDetail.cpp
 
 libfollybase_la_SOURCES = \
 	Conv.cpp \
@@ -486,7 +486,6 @@ libfollybase_la_SOURCES = \
 
 libfolly_la_SOURCES = \
 	Assume.cpp \
-	Checksum.cpp \
 	ClockGettimeWrappers.cpp \
 	concurrency/CacheLocality.cpp \
 	concurrency/GlobalThreadPoolList.cpp \
@@ -518,6 +517,7 @@ libfolly_la_SOURCES = \
 	experimental/hazptr/memory_resource.cpp \
 	GroupVarint.cpp \
 	GroupVarintTables.cpp \
+	hash/Checksum.cpp \
 	hash/SpookyHashV1.cpp \
 	hash/SpookyHashV2.cpp \
 	IPAddress.cpp \
diff --git a/folly/Checksum.cpp b/folly/hash/Checksum.cpp
similarity index 98%
rename from folly/Checksum.cpp
rename to folly/hash/Checksum.cpp
index 5fc17c08..54d6bf11 100644
--- a/folly/Checksum.cpp
+++ b/folly/hash/Checksum.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <folly/Checksum.h>
+#include <folly/hash/Checksum.h>
 #include <boost/crc.hpp>
 #include <folly/CpuId.h>
-#include <folly/detail/ChecksumDetail.h>
+#include <folly/hash/detail/ChecksumDetail.h>
 #include <algorithm>
 #include <stdexcept>
 
diff --git a/folly/Checksum.h b/folly/hash/Checksum.h
similarity index 100%
rename from folly/Checksum.h
rename to folly/hash/Checksum.h
diff --git a/folly/detail/ChecksumDetail.cpp b/folly/hash/detail/ChecksumDetail.cpp
similarity index 99%
rename from folly/detail/ChecksumDetail.cpp
rename to folly/hash/detail/ChecksumDetail.cpp
index 7a1f5923..bf141867 100644
--- a/folly/detail/ChecksumDetail.cpp
+++ b/folly/hash/detail/ChecksumDetail.cpp
@@ -110,7 +110,7 @@
  *    fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
  */
 
-#include <folly/detail/ChecksumDetail.h>
+#include <folly/hash/detail/ChecksumDetail.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/detail/ChecksumDetail.h b/folly/hash/detail/ChecksumDetail.h
similarity index 100%
rename from folly/detail/ChecksumDetail.h
rename to folly/hash/detail/ChecksumDetail.h
diff --git a/folly/detail/Crc32cDetail.cpp b/folly/hash/detail/Crc32cDetail.cpp
similarity index 99%
rename from folly/detail/Crc32cDetail.cpp
rename to folly/hash/detail/Crc32cDetail.cpp
index 514b44a9..f0b00f6c 100644
--- a/folly/detail/Crc32cDetail.cpp
+++ b/folly/hash/detail/Crc32cDetail.cpp
@@ -31,7 +31,7 @@
 
 #include <stdexcept>
 
-#include <folly/detail/ChecksumDetail.h>
+#include <folly/hash/detail/ChecksumDetail.h>
 
 #include <folly/CppAttributes.h>
 
diff --git a/folly/test/ChecksumTest.cpp b/folly/hash/test/ChecksumTest.cpp
similarity index 99%
rename from folly/test/ChecksumTest.cpp
rename to folly/hash/test/ChecksumTest.cpp
index 16489dce..e5e613c6 100644
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/hash/test/ChecksumTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <folly/Checksum.h>
+#include <folly/hash/Checksum.h>
 
 #include <boost/crc.hpp>
 
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
-#include <folly/detail/ChecksumDetail.h>
+#include <folly/hash/detail/ChecksumDetail.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 
-- 
2.34.1