From f6ed4a26c0f3e6ba12788206e54add9db18e4dd6 Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Thu, 4 Jan 2018 19:44:07 -0800 Subject: [PATCH] Move folly/BitIterator.h to folly/container/ Summary: [Folly] Move `folly/BitIterator.h` to `folly/container/`. Reviewed By: djwatson Differential Revision: D6648357 fbshipit-source-id: 5617e3210f58435fcbf3ef07fa745da47dbce475 --- CMakeLists.txt | 2 +- folly/Makefile.am | 2 +- folly/{ => container}/BitIterator.h | 4 ++-- folly/{ => container}/detail/BitIteratorDetail.h | 2 +- folly/{ => container}/test/BitIteratorTest.cpp | 4 ++-- folly/io/async/HHWheelTimer.cpp | 2 +- folly/test/IPAddressTest.cpp | 2 +- folly/test/Makefile.am | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename folly/{ => container}/BitIterator.h (98%) rename folly/{ => container}/detail/BitIteratorDetail.h (98%) rename folly/{ => container}/test/BitIteratorTest.cpp (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index dd5dff53..df597cfc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -337,6 +337,7 @@ if (BUILD_TESTS) DIRECTORY container/test/ TEST access_test SOURCES AccessTest.cpp TEST array_test SOURCES ArrayTest.cpp + TEST bit_iterator_test SOURCES BitIteratorTest.cpp TEST enumerate_test SOURCES EnumerateTest.cpp TEST evicting_cache_map_test SOURCES EvictingCacheMapTest.cpp TEST foreach_test SOURCES ForeachTest.cpp @@ -563,7 +564,6 @@ if (BUILD_TESTS) TEST atomic_linked_list_test SOURCES AtomicLinkedListTest.cpp TEST atomic_struct_test SOURCES AtomicStructTest.cpp TEST atomic_unordered_map_test SOURCES AtomicUnorderedMapTest.cpp - TEST bit_iterator_test SOURCES BitIteratorTest.cpp TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp TEST clock_gettime_wrappers_test SOURCES ClockGettimeWrappersTest.cpp TEST concurrent_skip_list_test SOURCES ConcurrentSkipListTest.cpp diff --git a/folly/Makefile.am b/folly/Makefile.am index c5b9d9ca..8144f806 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -57,6 +57,7 @@ nobase_follyinclude_HEADERS = \ concurrency/UnboundedQueue.h \ container/Access.h \ container/Array.h \ + container/detail/BitIteratorDetail.h \ container/Iterator.h \ container/Enumerate.h \ container/EvictingCacheMap.h \ @@ -67,7 +68,6 @@ nobase_follyinclude_HEADERS = \ detail/AtFork.h \ detail/AtomicHashUtils.h \ detail/AtomicUnorderedMapUtils.h \ - detail/BitIteratorDetail.h \ detail/DiscriminatedPtrDetail.h \ detail/FileUtilDetail.h \ detail/FingerprintPolynomial.h \ diff --git a/folly/BitIterator.h b/folly/container/BitIterator.h similarity index 98% rename from folly/BitIterator.h rename to folly/container/BitIterator.h index 0446bd13..c071e89f 100644 --- a/folly/BitIterator.h +++ b/folly/container/BitIterator.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 Facebook, Inc. + * Copyright 2011-present Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ #include #include -#include +#include #include namespace folly { diff --git a/folly/detail/BitIteratorDetail.h b/folly/container/detail/BitIteratorDetail.h similarity index 98% rename from folly/detail/BitIteratorDetail.h rename to folly/container/detail/BitIteratorDetail.h index 7f4f57e3..be9883b9 100644 --- a/folly/detail/BitIteratorDetail.h +++ b/folly/container/detail/BitIteratorDetail.h @@ -1,5 +1,5 @@ /* - * Copyright 2017 Facebook, Inc. + * Copyright 2011-present Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/folly/test/BitIteratorTest.cpp b/folly/container/test/BitIteratorTest.cpp similarity index 98% rename from folly/test/BitIteratorTest.cpp rename to folly/container/test/BitIteratorTest.cpp index 0fd13a2c..e452ad87 100644 --- a/folly/test/BitIteratorTest.cpp +++ b/folly/container/test/BitIteratorTest.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2017 Facebook, Inc. + * Copyright 2011-present Facebook, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include diff --git a/folly/io/async/HHWheelTimer.cpp b/folly/io/async/HHWheelTimer.cpp index dd7301f5..2e22a6d2 100644 --- a/folly/io/async/HHWheelTimer.cpp +++ b/folly/io/async/HHWheelTimer.cpp @@ -17,10 +17,10 @@ #include #include -#include #include #include #include +#include #include diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp index 23ab3c01..c42ec180 100644 --- a/folly/test/IPAddressTest.cpp +++ b/folly/test/IPAddressTest.cpp @@ -18,11 +18,11 @@ #include -#include #include #include #include #include +#include #include #include #include diff --git a/folly/test/Makefile.am b/folly/test/Makefile.am index 32055e92..41cfcb4f 100644 --- a/folly/test/Makefile.am +++ b/folly/test/Makefile.am @@ -170,7 +170,7 @@ bits_test_SOURCES = ../lang/test/BitsTest.cpp bits_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la TESTS += bits_test -bit_iterator_test_SOURCES = BitIteratorTest.cpp +bit_iterator_test_SOURCES = ../container/test/BitIteratorTest.cpp bit_iterator_test_LDADD = libfollytestmain.la $(top_builddir)/libfollybenchmark.la TESTS += bit_iterator_test -- 2.34.1