Merge to upstream r222492.

Change-Id: I6a0a6e90d217a69531ec3bb5ca0a367f39f4a1da
This commit is contained in:
Dan Albert
2014-11-20 15:55:17 -08:00
parent 54e693ac44
commit 7112dae6ac
584 changed files with 21668 additions and 1424 deletions

View File

@@ -7,6 +7,9 @@
//
//===----------------------------------------------------------------------===//
#include "__config"
#ifndef _LIBCPP_HAS_NO_THREADS
#define _LIBCPP_BUILDING_SHARED_MUTEX
#include "shared_mutex"
@@ -99,3 +102,5 @@ shared_timed_mutex::unlock_shared()
_LIBCPP_END_NAMESPACE_STD
#endif // !_LIBCPP_HAS_NO_THREADS