Merge pull request #472 from beached/v3

Bugfix: tuple_size<daw::json::json_pair>'s value member was private

Author: beached

CMakeLists.txt

@@ -9,7 +9,7 @@
 cmake_minimum_required( VERSION 3.14 )
 
 project( "daw-json-link"
-				 VERSION "3.31.0"
+				 VERSION "3.31.1"
 				 DESCRIPTION "Static JSON parsing in C++"
 				 HOMEPAGE_URL "https://github.com/beached/daw_json_link"
 				 LANGUAGES C CXX )

include/daw/json/impl/daw_json_value.h

@@ -106,6 +106,7 @@ namespace std {
 
 	template<daw::json::json_options_t PolicyFlags, typename Allocator>
 	class tuple_size<daw::json::basic_json_pair<PolicyFlags, Allocator>> {
+	public:
 		static constexpr std::size_t value = 2;
 	};
 } // namespace std

include/daw/json/impl/version.h

@@ -17,9 +17,9 @@
 #if not defined( DAW_JSON_VER_OVERRIDE )
 // Should be updated when a potential ABI break is anticipated
 #if defined( DEBUG ) or not defined( NDEBUG )
-#define DAW_JSON_VER v3_31_0d
+#define DAW_JSON_VER v3_31_1d
 #else
-#define DAW_JSON_VER v3_31_0
+#define DAW_JSON_VER v3_31_1
 #endif
 #else
 #define DAW_JSON_VER DAW_JSON_VER_OVERRIDE

tests/src/daw_json_link_test.cpp

@@ -1518,4 +1518,9 @@ int main( ) {
 		throw;
 	}
 #endif
+
+	static_assert( std::tuple_size_v<daw::json::json_pair> == 2 );
+	static_assert( std::tuple_size_v<daw::json::json_pair const> == 2 );
+	static_assert( std::tuple_size_v<daw::json::basic_json_pair<>> == 2 );
+	static_assert( std::tuple_size_v<daw::json::basic_json_pair<> const> == 2 );
 }