From d58181e677965b609be89b49ed7fbc4e78bf70b5 Mon Sep 17 00:00:00 2001 From: Andrii Grynenko Date: Tue, 21 Apr 2015 19:37:08 -0700 Subject: [PATCH] Move Singleton out of folly/experimental into folly/ Test Plan: contbuild Reviewed By: chip@fb.com Subscribers: wormhole-diffs@, trunkagent, hphp-diffs@, jan, simpkins, configerator-diffs@, fbcode-common-diffs@, chaoyc, bill, search-fbcode-diffs@, agallagher, nli, marcelo, ckwalsh, mcduff, hitesh, mshneer, unicorn-diffs@, vighnesh, fugalh, andreib, bmatheny, tw-eng@, tanmoyc, zhuohuang, rvm4, antonl, acampi, alikhtarov, hdoshi, rsethi, panin, folly-diffs@, lins, kennyyu, hannesr, jsedgwick, dominik, yfeldblum, songhao, raghavpi, labrams, lyang, chalfant, #preselection, macsyz, nimishshah FB internal diff: D2012267 Tasks: 5676394 Signature: t1:2012267:1430334667:eaad0262b35ffbfae86df5bdb45bf057ac62c51b --- folly/Makefile.am | 6 +++--- folly/{experimental => }/Singleton-inl.h | 0 folly/{experimental => }/Singleton.cpp | 2 +- folly/{experimental => }/Singleton.h | 2 +- folly/{experimental => }/SingletonStackTrace.cpp | 2 +- folly/{experimental => }/SingletonVault_c.cpp | 4 ++-- folly/{experimental => }/SingletonVault_c.h | 0 folly/experimental/JSONSchema.cpp | 2 +- folly/futures/detail/ThreadWheelTimekeeper.cpp | 2 +- folly/{experimental => }/test/SingletonTest.cpp | 2 +- folly/{experimental => }/test/SingletonVaultCTest.cpp | 4 ++-- folly/wangle/concurrent/GlobalExecutor.cpp | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) rename folly/{experimental => }/Singleton-inl.h (100%) rename folly/{experimental => }/Singleton.cpp (98%) rename folly/{experimental => }/Singleton.h (99%) rename folly/{experimental => }/SingletonStackTrace.cpp (97%) rename folly/{experimental => }/SingletonVault_c.cpp (92%) rename folly/{experimental => }/SingletonVault_c.h (100%) rename folly/{experimental => }/test/SingletonTest.cpp (99%) rename folly/{experimental => }/test/SingletonVaultCTest.cpp (94%) diff --git a/folly/Makefile.am b/folly/Makefile.am index 245f4c89..442e070b 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -105,8 +105,6 @@ nobase_follyinclude_HEADERS = \ experimental/JSONSchema.h \ experimental/Select64.h \ experimental/SharedMutex.h \ - experimental/Singleton.h \ - experimental/Singleton-inl.h \ experimental/StringKeyedCommon.h \ experimental/StringKeyedUnorderedMap.h \ experimental/StringKeyedUnorderedSet.h \ @@ -227,6 +225,8 @@ nobase_follyinclude_HEADERS = \ Range.h \ RWSpinLock.h \ ScopeGuard.h \ + Singleton.h \ + Singleton-inl.h \ SmallLocks.h \ small_vector.h \ SocketAddress.h \ @@ -377,6 +377,7 @@ libfolly_la_SOURCES = \ Random.cpp \ SafeAssert.cpp \ SocketAddress.cpp \ + Singleton.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ stats/Instantiations.cpp \ @@ -395,7 +396,6 @@ libfolly_la_SOURCES = \ experimental/JSONSchema.cpp \ experimental/Select64.cpp \ experimental/SharedMutex.cpp \ - experimental/Singleton.cpp \ experimental/TestUtil.cpp \ wangle/acceptor/Acceptor.cpp \ wangle/acceptor/ConnectionManager.cpp \ diff --git a/folly/experimental/Singleton-inl.h b/folly/Singleton-inl.h similarity index 100% rename from folly/experimental/Singleton-inl.h rename to folly/Singleton-inl.h diff --git a/folly/experimental/Singleton.cpp b/folly/Singleton.cpp similarity index 98% rename from folly/experimental/Singleton.cpp rename to folly/Singleton.cpp index 1c39326e..bfd63e57 100644 --- a/folly/experimental/Singleton.cpp +++ b/folly/Singleton.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include diff --git a/folly/experimental/Singleton.h b/folly/Singleton.h similarity index 99% rename from folly/experimental/Singleton.h rename to folly/Singleton.h index 7af17256..c9868d4d 100644 --- a/folly/experimental/Singleton.h +++ b/folly/Singleton.h @@ -514,4 +514,4 @@ class Singleton { } -#include +#include diff --git a/folly/experimental/SingletonStackTrace.cpp b/folly/SingletonStackTrace.cpp similarity index 97% rename from folly/experimental/SingletonStackTrace.cpp rename to folly/SingletonStackTrace.cpp index da535743..3e1f87cc 100644 --- a/folly/experimental/SingletonStackTrace.cpp +++ b/folly/SingletonStackTrace.cpp @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include #include namespace folly { diff --git a/folly/experimental/SingletonVault_c.cpp b/folly/SingletonVault_c.cpp similarity index 92% rename from folly/experimental/SingletonVault_c.cpp rename to folly/SingletonVault_c.cpp index 92ac83f5..5a6d6d44 100644 --- a/folly/experimental/SingletonVault_c.cpp +++ b/folly/SingletonVault_c.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/folly/experimental/SingletonVault_c.h b/folly/SingletonVault_c.h similarity index 100% rename from folly/experimental/SingletonVault_c.h rename to folly/SingletonVault_c.h diff --git a/folly/experimental/JSONSchema.cpp b/folly/experimental/JSONSchema.cpp index 6978cf69..5413da38 100644 --- a/folly/experimental/JSONSchema.cpp +++ b/folly/experimental/JSONSchema.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include namespace folly { diff --git a/folly/futures/detail/ThreadWheelTimekeeper.cpp b/folly/futures/detail/ThreadWheelTimekeeper.cpp index 51965d10..f861af23 100644 --- a/folly/futures/detail/ThreadWheelTimekeeper.cpp +++ b/folly/futures/detail/ThreadWheelTimekeeper.cpp @@ -15,7 +15,7 @@ */ #include "ThreadWheelTimekeeper.h" -#include +#include #include #include diff --git a/folly/experimental/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp similarity index 99% rename from folly/experimental/test/SingletonTest.cpp rename to folly/test/SingletonTest.cpp index f29db472..19baebb2 100644 --- a/folly/experimental/test/SingletonTest.cpp +++ b/folly/test/SingletonTest.cpp @@ -16,7 +16,7 @@ #include -#include +#include #include diff --git a/folly/experimental/test/SingletonVaultCTest.cpp b/folly/test/SingletonVaultCTest.cpp similarity index 94% rename from folly/experimental/test/SingletonVaultCTest.cpp rename to folly/test/SingletonVaultCTest.cpp index 4fcc1eae..1182278e 100644 --- a/folly/experimental/test/SingletonVaultCTest.cpp +++ b/folly/test/SingletonVaultCTest.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include -#include +#include +#include #include diff --git a/folly/wangle/concurrent/GlobalExecutor.cpp b/folly/wangle/concurrent/GlobalExecutor.cpp index ac7b9bac..36a82155 100644 --- a/folly/wangle/concurrent/GlobalExecutor.cpp +++ b/folly/wangle/concurrent/GlobalExecutor.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include #include -- 2.34.1