diff options
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__config | 9 | ||||
| -rw-r--r-- | libcxx/include/__mutex_base | 3 | ||||
| -rw-r--r-- | libcxx/include/functional | 3 | ||||
| -rw-r--r-- | libcxx/include/iterator | 1 | ||||
| -rw-r--r-- | libcxx/include/mutex | 1 | ||||
| -rw-r--r-- | libcxx/include/shared_mutex | 1 | ||||
| -rw-r--r-- | libcxx/include/string_view | 1 |
7 files changed, 18 insertions, 1 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index e49adb4d63a..a8991c37056 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -1429,6 +1429,15 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container( #define _LIBCPP_UNUSED_VAR(x) ((void)(x)) +#ifndef _LIBCPP_HAS_NO_DEDUCTION_GUIDES +#define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName) \ + template <class _Tag = void> \ + _ClassName(typename _Tag::__allow_ctad) -> _ClassName<void> +#else +#define _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(_ClassName) \ + static_assert(true, "") +#endif // _LIBCPP_HAS_NO_DEDUCTION_GUIDES + #endif // __cplusplus #endif // _LIBCPP_CONFIG diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index f828beaf780..6361c2088b7 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -107,6 +107,8 @@ private: lock_guard(lock_guard const&) _LIBCPP_EQUAL_DELETE; lock_guard& operator=(lock_guard const&) _LIBCPP_EQUAL_DELETE; }; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(lock_guard); + template <class _Mutex> class _LIBCPP_TEMPLATE_VIS unique_lock @@ -205,6 +207,7 @@ public: _LIBCPP_INLINE_VISIBILITY mutex_type* mutex() const _NOEXCEPT {return __m_;} }; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(unique_lock); template <class _Mutex> void diff --git a/libcxx/include/functional b/libcxx/include/functional index 865a28123b9..dd65f1bc70e 100644 --- a/libcxx/include/functional +++ b/libcxx/include/functional @@ -3067,7 +3067,8 @@ private: _ForwardIterator __first_; _ForwardIterator __last_; _BinaryPredicate __pred_; - }; +}; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(default_searcher); #endif // _LIBCPP_STD_VER > 14 diff --git a/libcxx/include/iterator b/libcxx/include/iterator index 30801ea83db..b503f157b1e 100644 --- a/libcxx/include/iterator +++ b/libcxx/include/iterator @@ -841,6 +841,7 @@ public: _LIBCPP_INLINE_VISIBILITY back_insert_iterator& operator++() {return *this;} _LIBCPP_INLINE_VISIBILITY back_insert_iterator operator++(int) {return *this;} }; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(back_insert_iterator); template <class _Container> inline _LIBCPP_INLINE_VISIBILITY diff --git a/libcxx/include/mutex b/libcxx/include/mutex index 20c3ffc38b6..a7d6232a724 100644 --- a/libcxx/include/mutex +++ b/libcxx/include/mutex @@ -546,6 +546,7 @@ private: _MutexTuple __t_; }; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(scoped_lock); #endif // _LIBCPP_STD_VER > 14 #endif // !_LIBCPP_HAS_NO_THREADS diff --git a/libcxx/include/shared_mutex b/libcxx/include/shared_mutex index fcafd8c0f44..c9911340ea1 100644 --- a/libcxx/include/shared_mutex +++ b/libcxx/include/shared_mutex @@ -430,6 +430,7 @@ public: _LIBCPP_INLINE_VISIBILITY mutex_type* mutex() const _NOEXCEPT {return __m_;} }; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(shared_lock); template <class _Mutex> void diff --git a/libcxx/include/string_view b/libcxx/include/string_view index 04448312ff3..39ebc669744 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -604,6 +604,7 @@ private: const value_type* __data; size_type __size; }; +_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_string_view); // [string.view.comparison] |
