Merge pull request #540 from beached/v2

Removed DAW_FWD2 and fixed mismatch of struct/class

Author: beached

CMakeLists.txt

@@ -9,7 +9,7 @@
 cmake_minimum_required( VERSION 3.14 )
 
 project( "daw-header-libraries"
-         VERSION "2.118.0"
+         VERSION "2.123.0"
          DESCRIPTION "Various headers"
          HOMEPAGE_URL "https://github.com/beached/header_libraries"
          LANGUAGES C CXX

include/daw/algorithms/daw_array_compare.h

@@ -0,0 +1,53 @@
+// Copyright (c) Darrell Wright
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+// Official repository: https://github.com/beached/header_libraries
+//
+
+#pragma once
+
+#include "daw/daw_attributes.h"
+#include "daw/daw_ordering_to_integer.h"
+#include "daw/daw_traits.h"
+#include "daw/traits/daw_remove_array_ref.h"
+
+#include <functional>
+#include <type_traits>
+
+namespace daw {
+	namespace array_cmp_details {
+#if defined( DAW_HAS_CPP20_3WAY )
+		template<typename Order>
+		inline constexpr Order equal_or_equivalent_v =
+		  daw::equal_or_equivalent_v<Order>;
+#else
+		template<typename>
+		inline constexpr bool equal_or_equivalent_v = true;
+#endif
+	} // namespace array_cmp_details
+
+	template<typename T, typename Compare = std::equal_to<>,
+	         typename U = std::enable_if_t<std::is_array_v<remove_array_ref_t<T>>,
+	                                       remove_array_ref_t<T>>>
+	DAW_ATTRIB_FLATTEN constexpr auto
+	array_cmp( T &&lhs, T &&rhs, Compare const &cmp = Compare{ } ) {
+		using compare_result_t =
+		  std::invoke_result_t<Compare, std::remove_all_extents_t<U>,
+		                       std::remove_all_extents_t<U>>;
+		for( std::size_t n = 0; n < std::extent_v<U>; ++n ) {
+			auto r = [&] {
+				if constexpr( std::rank_v<U> > 1 ) {
+					return array_cmp( lhs[n], rhs[n], cmp );
+				} else {
+					return cmp( lhs[n], rhs[n] );
+				}
+			}( );
+			if( r != array_cmp_details::equal_or_equivalent_v<compare_result_t> ) {
+				return r;
+			}
+		}
+		return array_cmp_details::equal_or_equivalent_v<compare_result_t>;
+	}
+} // namespace daw

include/daw/compressed_pair.h

@@ -44,7 +44,7 @@ namespace daw {
 		explicit constexpr compressed_pair_elem( std::piecewise_construct_t,
 		                                         std::tuple<Args...> args,
 		                                         std::index_sequence<Indexes...> )
-		  : m_value( DAW_FWD2( Args, std::get<Indexes>( args ) )... ) {}
+		  : m_value( DAW_FWD( std::get<Indexes>( args ) )... ) {}
 
 		constexpr reference get( ) noexcept {
 			return m_value;
@@ -76,7 +76,7 @@ namespace daw {
 		explicit constexpr compressed_pair_elem( std::piecewise_construct_t,
 		                                         std::tuple<Args...> args,
 		                                         std::index_sequence<Indexes...> )
-		  : value_type( DAW_FWD2( Args, std::get<Indexes>( args ) )... ) {}
+		  : value_type( DAW_FWD( std::get<Indexes>( args ) )... ) {}
 
 		constexpr reference get( ) noexcept {
 			return *this;
@@ -113,8 +113,8 @@ namespace daw {
 
 		template<typename U1, typename U2>
 		explicit constexpr compressed_pair( U1 &&t1, U2 &&t2 )
-		  : Base1( DAW_FWD2( U1, t1 ) )
-		  , Base2( DAW_FWD2( U2, t2 ) ) {}
+		  : Base1( DAW_FWD( t1 ) )
+		  , Base2( DAW_FWD( t2 ) ) {}
 
 		template<class... Args1, class... Args2>
 		explicit constexpr compressed_pair( std::piecewise_construct_t pc,