Updated to reflect order change in json_array

Author: beached

glean.cmake

@@ -30,7 +30,7 @@ externalproject_add(
   GIT_REPOSITORY "https://github.com/beached/date.git"
   SOURCE_DIR "${CMAKE_BINARY_DIR}/dependencies/date"
   INSTALL_DIR "${CMAKE_BINARY_DIR}/install"
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/install -DGLEAN_INSTALL_ROOT=${CMAKE_BINARY_DIR}/install -DUSE_SYSTEM_TZ_DB=ON -DENABLE_DATE_TESTING=OFF -DCMAKE_CXX_STANDARD=17
 )
 
 externalproject_add(

include/types/ti_boolean.h

@@ -42,7 +42,7 @@ namespace daw::json_to_cpp::types {
 		}
 
 		static inline std::string array_member_info( ) noexcept {
-			return "json_bool<no_name>";
+			return "bool";
 		}
 
 		inline static std::string

include/types/ti_integral.h

@@ -44,7 +44,7 @@ namespace daw::json_to_cpp::types {
 		}
 
 		static inline std::string array_member_info( ) noexcept {
-			return "json_number<no_name, int64_t>";
+			return "int64_t";
 		}
 
 		inline static std::string

include/types/ti_real.h

@@ -44,7 +44,7 @@ namespace daw::json_to_cpp::types {
 		}
 
 		static inline std::string array_member_info( ) noexcept {
-			return "json_number<no_name>";
+			return "double";
 		}
 
 		inline static std::string

include/types/ti_string.h

@@ -53,7 +53,7 @@ namespace daw::json_to_cpp::types {
 			if( m_use_string_view ) {
 				return "json_string<no_name, std::string_view>";
 			}
-			return "json_string<no_name>";
+			return "std::string";
 		}
 
 		inline std::string json_name( daw::string_view member_name, bool use_cpp20,

src/ti_array.cpp

@@ -69,14 +69,15 @@ namespace daw::json_to_cpp::types {
 	                                 daw::string_view parent_name ) const {
 		if( children->empty( ) ) {
 			return "json_array<" +
-			       impl::format_member_name( member_name, use_cpp20, parent_name ) +
-			       ", " + name( ) + ", " + ti_null::array_member_info( ) + ">";
+			       impl::format_member_name( member_name, use_cpp20, parent_name ) + 
+						 ", " + ti_null::array_member_info( ) +
+			       ", " + name( )  + ">";
 		}
 		return "json_array<" +
 		       impl::format_member_name( member_name, use_cpp20, parent_name ) +
-		       ", " + name( ) + ", " +
-		       ::daw::json_to_cpp::types::array_member_info(
+					 ", " + daw::json_to_cpp::types::array_member_info(
 		         children->front( ).second ) +
+		       ", " + name( ) + 
 		       ">";
 	}