diff options
| author | Eric Fiselier <eric@efcs.ca> | 2017-06-08 07:18:15 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2017-06-08 07:18:15 +0000 |
| commit | 1ef13310b8bc122b951734fe85d662969b5a03a2 (patch) | |
| tree | 19cb0fdc6be7e6a2ef9c1a23ce1d1f8fa12f1667 /libcxx | |
| parent | 79271ab1549da9114826c15226028144647ba05c (diff) | |
| download | bcm5719-llvm-1ef13310b8bc122b951734fe85d662969b5a03a2.tar.gz bcm5719-llvm-1ef13310b8bc122b951734fe85d662969b5a03a2.zip | |
Revert r304955 - Fix class template deduction for scoped_lock.
Richard decided to fix these cases in Clang, even though they are
representative of a larger problem for more complex
cases.
llvm-svn: 304966
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/mutex | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libcxx/include/mutex b/libcxx/include/mutex index 1062f2b443e..1557ed8770d 100644 --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -546,11 +546,6 @@ private: _MutexTuple __t_; }; -#ifdef __cpp_deduction_guides -template <class _Mutex> explicit scoped_lock(_Mutex&) -> scoped_lock<_Mutex>; -explicit scoped_lock() -> scoped_lock<>; -#endif - #endif // _LIBCPP_STD_VER > 14 #endif // !_LIBCPP_HAS_NO_THREADS |
