Merge pull request #518 from beached/v2

removed functional from string_view 2
beached · Jan 8, 2024 · 6f85714 · 6f85714
2 parents 89e330c + 38764bc
commit 6f85714
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@
 cmake_minimum_required( VERSION 3.14 )
 
 project( "daw-header-libraries"
-         VERSION "2.98.3"
+         VERSION "2.98.4"
          DESCRIPTION "Various headers"
          HOMEPAGE_URL "https://github.com/beached/header_libraries"
          LANGUAGES C CXX

diff --git a/include/daw/daw_attributes.h b/include/daw/daw_attributes.h
@@ -94,10 +94,8 @@
 #define DAW_NO_UNIQUE_ADDRESS [[no_unique_address]]
 #endif
 
-#if defined( __clang__ )
+#if DAW_HAS_CLANG_VER_GTE( 13, 0 )
 #define DAW_PREF_NAME( ... ) clang::preferred_name( __VA_ARGS__ )
-//#elif defined( __GNUC__ )
-//#define DAW_PREF_NAME( ... ) gnu::preferred_name( __VA_ARGS__ )
 #else
 #define DAW_PREF_NAME( ... )
 #endif
diff --git a/include/daw/daw_string_view2.h b/include/daw/daw_string_view2.h
@@ -29,7 +29,6 @@
 
 #include <cstddef>
 #include <cstdlib>
-#include <functional>
 #include <iterator>
 #include <stdexcept>
 #include <type_traits>
@@ -112,6 +111,34 @@ namespace daw {
 	  namespace sv2 {
 
 		namespace sv2_details {
+#if defined( __cpp_static_call_operator )
+#if __cpp_static_call_operator >= 202207L
+#define DAW_SV2_HAS_STATIC_CALL_OP
+#endif
+#endif
+			struct less {
+				template<typename T, typename U>
+#if defined( DAW_SV2_HAS_STATIC_CALL_OP )
+#if DAW_HAS_CLANG_VER_GTE( 16, 0 )
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++23-extensions"
+#endif
+				DAW_ATTRIB_INLINE static constexpr bool
+				operator( )( T const &lhs, U const &rhs ) noexcept {
+					return lhs < rhs;
+				}
+
+#if DAW_HAS_CLANG_VER_GTE( 16, 0 )
+#pragma clang diagnostic pop
+#endif
+#else
+				DAW_ATTRIB_INLINE constexpr bool
+				operator( )( T const &lhs, U const &rhs ) const noexcept {
+					return lhs < rhs;
+				}
+#endif
+			};
+
 			template<typename InputIt, typename ForwardIt, typename BinaryPredicate>
 			[[nodiscard]] constexpr InputIt
 			find_first_of( InputIt first, InputIt last, ForwardIt s_first,
@@ -1564,7 +1591,7 @@ namespace daw {
 			}
 
 		public:
-			template<typename Compare = std::less<void>, string_view_bounds_type BL,
+			template<typename Compare = sv2_details::less, string_view_bounds_type BL,
 			         string_view_bounds_type BR>
 			[[nodiscard]] static constexpr int
 			compare( basic_string_view<CharT, BL> lhs,
@@ -1600,51 +1627,52 @@ namespace daw {
 				return ret;
 			}
 
-			template<typename Compare = std::less<>, string_view_bounds_type B>
+			template<typename Compare = sv2_details::less, string_view_bounds_type B>
 			[[nodiscard]] constexpr int compare( basic_string_view<CharT, B> rhs,
 			                                     Compare cmp = Compare{ } ) const {
 				return compare(
 				  *this, basic_string_view( std::data( rhs ), std::size( rhs ) ), cmp );
 			}
 
-			template<typename Compare = std::less<>, typename StringView,
+			template<typename Compare = sv2_details::less, typename StringView,
 			         DAW_REQ_CONTIG_CHAR_RANGE( StringView, CharT )>
 			[[nodiscard]] constexpr int compare( StringView &&rhs,
 			                                     Compare cmp = Compare{ } ) const {
 				return compare(
 				  *this, basic_string_view( std::data( rhs ), std::size( rhs ) ), cmp );
 			}
 
-			template<typename Compare = std::less<>, std::size_t N>
+			template<typename Compare = sv2_details::less, std::size_t N>
 			[[nodiscard]] constexpr int compare( CharT const ( &rhs )[N],
 			                                     Compare cmp = Compare{ } ) const {
 				return compare( *this, basic_string_view( rhs, N - 1 ), cmp );
 			}
 
-			template<typename Compare = std::less<>>
+			template<typename Compare = sv2_details::less>
 			constexpr int compare( size_type pos1, size_type count1,
 			                       basic_string_view v,
 			                       Compare cmp = Compare{ } ) const {
 				return compare( substr( pos1, count1 ), v, cmp );
 			}
 
-			template<typename Compare = std::less<>, string_view_bounds_type Bounds>
+			template<typename Compare = sv2_details::less,
+			         string_view_bounds_type Bounds>
 			[[nodiscard]] constexpr int compare( size_type pos1, size_type count1,
 			                                     basic_string_view<CharT, Bounds> v,
 			                                     size_type pos2, size_type count2,
 			                                     Compare cmp = Compare{ } ) const {
 				return compare( substr( pos1, count1 ), v.substr( pos2, count2 ), cmp );
 			}
 
-			template<typename Compare = std::less<>>
+			template<typename Compare = sv2_details::less>
 			[[nodiscard]] constexpr int compare( size_type pos1, size_type count1,
 			                                     const_pointer s,
 			                                     Compare cmp = Compare{ } ) const {
 				return compare( substr( pos1, count1 ),
 				                basic_string_view<CharT, BoundsType>( s ), cmp );
 			}
 
-			template<typename Compare = std::less<>>
+			template<typename Compare = sv2_details::less>
 			[[nodiscard]] constexpr int compare( size_type pos1, size_type count1,
 			                                     const_pointer s, size_type count2,
 			                                     Compare cmp = Compare{ } ) const {

diff --git a/tests/daw_zipcontainer_test.cpp b/tests/daw_zipcontainer_test.cpp
@@ -15,9 +15,12 @@ int main( ) {
 	auto a = std::vector{ 1, 2, 3 };
 	auto b = std::vector{ 9, 8, 7 };
 	auto z = daw::zip_container( a, b );
-	for( auto &&item : z ) {
-		if( std::apply( []( auto const &l, auto const &r ) { return l + r; },
-		                item ) != 10 ) {
+	for( auto item : z ) {
+		if( std::apply(
+		      []( auto const &l, auto const &r ) {
+			      return l + r;
+		      },
+		      item ) != 10 ) {
 			std::abort( );
 		}
 	}