Commit d58181e6 authored by Andrii Grynenko's avatar Andrii Grynenko

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
parent 124877d3
...@@ -105,8 +105,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -105,8 +105,6 @@ nobase_follyinclude_HEADERS = \
experimental/JSONSchema.h \ experimental/JSONSchema.h \
experimental/Select64.h \ experimental/Select64.h \
experimental/SharedMutex.h \ experimental/SharedMutex.h \
experimental/Singleton.h \
experimental/Singleton-inl.h \
experimental/StringKeyedCommon.h \ experimental/StringKeyedCommon.h \
experimental/StringKeyedUnorderedMap.h \ experimental/StringKeyedUnorderedMap.h \
experimental/StringKeyedUnorderedSet.h \ experimental/StringKeyedUnorderedSet.h \
...@@ -227,6 +225,8 @@ nobase_follyinclude_HEADERS = \ ...@@ -227,6 +225,8 @@ nobase_follyinclude_HEADERS = \
Range.h \ Range.h \
RWSpinLock.h \ RWSpinLock.h \
ScopeGuard.h \ ScopeGuard.h \
Singleton.h \
Singleton-inl.h \
SmallLocks.h \ SmallLocks.h \
small_vector.h \ small_vector.h \
SocketAddress.h \ SocketAddress.h \
...@@ -377,6 +377,7 @@ libfolly_la_SOURCES = \ ...@@ -377,6 +377,7 @@ libfolly_la_SOURCES = \
Random.cpp \ Random.cpp \
SafeAssert.cpp \ SafeAssert.cpp \
SocketAddress.cpp \ SocketAddress.cpp \
Singleton.cpp \
SpookyHashV1.cpp \ SpookyHashV1.cpp \
SpookyHashV2.cpp \ SpookyHashV2.cpp \
stats/Instantiations.cpp \ stats/Instantiations.cpp \
...@@ -395,7 +396,6 @@ libfolly_la_SOURCES = \ ...@@ -395,7 +396,6 @@ libfolly_la_SOURCES = \
experimental/JSONSchema.cpp \ experimental/JSONSchema.cpp \
experimental/Select64.cpp \ experimental/Select64.cpp \
experimental/SharedMutex.cpp \ experimental/SharedMutex.cpp \
experimental/Singleton.cpp \
experimental/TestUtil.cpp \ experimental/TestUtil.cpp \
wangle/acceptor/Acceptor.cpp \ wangle/acceptor/Acceptor.cpp \
wangle/acceptor/ConnectionManager.cpp \ wangle/acceptor/ConnectionManager.cpp \
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <string> #include <string>
......
...@@ -514,4 +514,4 @@ class Singleton { ...@@ -514,4 +514,4 @@ class Singleton {
} }
#include <folly/experimental/Singleton-inl.h> #include <folly/Singleton-inl.h>
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <folly/experimental/symbolizer/Symbolizer.h> #include <folly/experimental/symbolizer/Symbolizer.h>
namespace folly { namespace folly {
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/experimental/SingletonVault_c.h> #include <folly/SingletonVault_c.h>
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <folly/Memory.h> #include <folly/Memory.h>
#include <folly/Optional.h> #include <folly/Optional.h>
#include <folly/String.h> #include <folly/String.h>
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <folly/json.h> #include <folly/json.h>
namespace folly { namespace folly {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
#include "ThreadWheelTimekeeper.h" #include "ThreadWheelTimekeeper.h"
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <folly/futures/Future.h> #include <folly/futures/Future.h>
#include <future> #include <future>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <thread> #include <thread>
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <folly/Benchmark.h> #include <folly/Benchmark.h>
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <folly/experimental/SingletonVault_c.h> #include <folly/SingletonVault_c.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <folly/experimental/Singleton.h> #include <folly/Singleton.h>
#include <folly/wangle/concurrent/IOExecutor.h> #include <folly/wangle/concurrent/IOExecutor.h>
#include <folly/wangle/concurrent/IOThreadPoolExecutor.h> #include <folly/wangle/concurrent/IOThreadPoolExecutor.h>
#include <folly/futures/InlineExecutor.h> #include <folly/futures/InlineExecutor.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment