From 186bd8ade9668acd931201b4913d3c2af1f9535f Mon Sep 17 00:00:00 2001 From: Nathan Bronson Date: Wed, 17 Jun 2015 14:27:06 -0700 Subject: [PATCH] move SharedMutex from folly/experimental to folly Summary: SharedMutex has been in heavy production use for a while with no bugs reported and no API changes requested, it is no longer experimental. Reviewed By: @yfeldblum Differential Revision: D2165275 --- folly/Makefile.am | 6 +++--- folly/{experimental => }/SharedMutex.cpp | 0 folly/{experimental => }/SharedMutex.h | 0 folly/{experimental => }/test/SharedMutexTest.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename folly/{experimental => }/SharedMutex.cpp (100%) rename folly/{experimental => }/SharedMutex.h (100%) rename folly/{experimental => }/test/SharedMutexTest.cpp (99%) diff --git a/folly/Makefile.am b/folly/Makefile.am index a682e012..bdfbe6d5 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -109,7 +109,6 @@ nobase_follyinclude_HEADERS = \ experimental/JSONSchema.h \ experimental/LockFreeRingBuffer.h \ experimental/Select64.h \ - experimental/SharedMutex.h \ experimental/StringKeyedCommon.h \ experimental/StringKeyedUnorderedMap.h \ experimental/StringKeyedUnorderedSet.h \ @@ -233,6 +232,7 @@ nobase_follyinclude_HEADERS = \ Range.h \ RWSpinLock.h \ ScopeGuard.h \ + SharedMutex.h \ Singleton.h \ Singleton-inl.h \ SmallLocks.h \ @@ -390,8 +390,9 @@ libfolly_la_SOURCES = \ MemoryMapping.cpp \ Random.cpp \ SafeAssert.cpp \ - SocketAddress.cpp \ + SharedMutex.cpp \ Singleton.cpp \ + SocketAddress.cpp \ SpookyHashV1.cpp \ SpookyHashV2.cpp \ stats/Instantiations.cpp \ @@ -410,7 +411,6 @@ libfolly_la_SOURCES = \ experimental/io/FsUtil.cpp \ experimental/JSONSchema.cpp \ experimental/Select64.cpp \ - experimental/SharedMutex.cpp \ experimental/TestUtil.cpp \ wangle/acceptor/Acceptor.cpp \ wangle/acceptor/ConnectionManager.cpp \ diff --git a/folly/experimental/SharedMutex.cpp b/folly/SharedMutex.cpp similarity index 100% rename from folly/experimental/SharedMutex.cpp rename to folly/SharedMutex.cpp diff --git a/folly/experimental/SharedMutex.h b/folly/SharedMutex.h similarity index 100% rename from folly/experimental/SharedMutex.h rename to folly/SharedMutex.h diff --git a/folly/experimental/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp similarity index 99% rename from folly/experimental/test/SharedMutexTest.cpp rename to folly/test/SharedMutexTest.cpp index 026284c3..3b374f09 100644 --- a/folly/experimental/test/SharedMutexTest.cpp +++ b/folly/test/SharedMutexTest.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include -- 2.34.1