This patch uses std::is_void in helper_function.h instead of __is_void defined
in cpp_type_traits.h to avoid conflicts with the __is_void built-in trait to
be implemented.

libstdc++-v3/ChangeLog:

        * include/debug/helper_function.h (_DiffTraits): Use std::void
        instead of __is_void defined in cpp_type_traits.h

Signed-off-by: Ken Matsui <kmat...@cs.washington.edu>
---
 libstdc++-v3/include/debug/helper_functions.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libstdc++-v3/include/debug/helper_functions.h 
b/libstdc++-v3/include/debug/helper_functions.h
index dccf8e9e5e6..e364a630d2c 100644
--- a/libstdc++-v3/include/debug/helper_functions.h
+++ b/libstdc++-v3/include/debug/helper_functions.h
@@ -67,7 +67,7 @@ namespace __gnu_debug
        typename std::iterator_traits<_Iterator>::difference_type _ItDiffType;
 
       template<typename _DiffType,
-              typename = typename std::__is_void<_DiffType>::__type>
+              typename = typename std::is_void<_DiffType>::type>
        struct _DiffTraits
        { typedef _DiffType __type; };
 
-- 
2.40.0

Reply via email to