libstdc++: Only use std::compare_three_way when concepts are supported

Clang now supports three-way comparisons. That causes both overloads of
std::lexicographical_compare_three_way to be defined, but the second one
uses std::compare_three_way which depends on concepts. Clang does not
yet support concepts, so the second overload should also depend on
__cpp_lib_concepts.

	* include/bits/stl_algobase.h (lexicographical_compare_three_way):
	Only define four-argument overload when __cpp_lib_concepts is defined.

From-SVN: r279861

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb32f6ec4cbe0f2c5fbd97ff27f2e36e517683c9..3b65de706f227f435ca61ea7ffe6aced393d53a4 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-03  Jonathan Wakely  <jwakely@redhat.com>
+
+       * include/bits/stl_algobase.h (lexicographical_compare_three_way):
+       Only define four-argument overload when __cpp_lib_concepts is defined.
+
 2020-01-01  John David Anglin  <danglin@gcc.gnu.org>
 
        * config/abi/post/hppa-linux-gnu/baseline_symbols.txt: Update.

diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 13de6aecc6c3685763a983bbe6599004c8f1b26c..76c323ab21b98892da1eeb75fbdefe4ac486c923 100644 (file)
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -1751,6 +1751,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
        : __first2 != __last2 ? strong_ordering::less : strong_ordering::equal;
     }
 
+#if __cpp_lib_concepts
   template<typename _InputIter1, typename _InputIter2>
     constexpr auto
     lexicographical_compare_three_way(_InputIter1 __first1,
@@ -1762,6 +1763,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
                                                    __first2, __last2,
                                                    compare_three_way{});
     }
+#endif // concepts
 #endif // three_way_comparison
 
   template<typename _InputIterator1, typename _InputIterator2,