summaryrefslogtreecommitdiffstats
path: root/libcxx/include
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2019-08-04 07:13:43 +0000
committerEric Fiselier <eric@efcs.ca>2019-08-04 07:13:43 +0000
commit278d59301446afb40f0345bd411099fa311291a4 (patch)
tree5831d071dae263da0ea3cff1c3369d2964a2c525 /libcxx/include
parentd34099926e909390cb0254bebb4b7f5cf15467c7 (diff)
downloadbcm5719-llvm-278d59301446afb40f0345bd411099fa311291a4.tar.gz
bcm5719-llvm-278d59301446afb40f0345bd411099fa311291a4.zip
Revert "Suppress -Wctad-maybe-unsupported on types w/o deduction guides."
Some modules builds are issuing buggy diagnostics. The cause of which is TBD. This reverts commit r@367770. llvm-svn: 367777
Diffstat (limited to 'libcxx/include')
-rw-r--r--libcxx/include/__config9
-rw-r--r--libcxx/include/__mutex_base3
-rw-r--r--libcxx/include/functional3
-rw-r--r--libcxx/include/iterator1
-rw-r--r--libcxx/include/mutex1
-rw-r--r--libcxx/include/shared_mutex1
-rw-r--r--libcxx/include/string_view1
7 files changed, 1 insertions, 18 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config
index a8991c37056..e49adb4d63a 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1429,15 +1429,6 @@ _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 6361c2088b7..f828beaf780 100644
--- a/libcxx/include/__mutex_base
+++ b/libcxx/include/__mutex_base
@@ -107,8 +107,6 @@ 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
@@ -207,7 +205,6 @@ 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 dd65f1bc70e..865a28123b9 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -3067,8 +3067,7 @@ 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 b503f157b1e..30801ea83db 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -841,7 +841,6 @@ 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 a7d6232a724..20c3ffc38b6 100644
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -546,7 +546,6 @@ 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 c9911340ea1..fcafd8c0f44 100644
--- a/libcxx/include/shared_mutex
+++ b/libcxx/include/shared_mutex
@@ -430,7 +430,6 @@ 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 39ebc669744..04448312ff3 100644
--- a/libcxx/include/string_view
+++ b/libcxx/include/string_view
@@ -604,7 +604,6 @@ private:
const value_type* __data;
size_type __size;
};
-_LIBCPP_CTAD_SUPPORTED_FOR_TYPE(basic_string_view);
// [string.view.comparison]
OpenPOWER on IntegriCloud