Updated to reflect changes in header_libraries

Author: beached

CMakeLists.txt

@@ -8,7 +8,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 project("json_to_cpp"
-        VERSION "2.1.0"
+        VERSION "2.1.1"
         DESCRIPTION "Try to use the JSON structures to make C++ structures and bindings"
         HOMEPAGE_URL "https://github.com/beached/json_to_cpp"
         LANGUAGES C CXX)

extern/CMakeLists.txt

@@ -17,7 +17,7 @@ include(FetchContent)
 FetchContent_Declare(
         daw_parse_json
         GIT_REPOSITORY https://github.com/beached/parse_json.git
-        GIT_TAG v1.1.0
+        GIT_TAG v1.1.1
 )
 
 FetchContent_Declare(

include/types/ti_base.h

@@ -26,9 +26,8 @@ namespace daw::json_to_cpp::types::impl {
 	inline constexpr size_t ti_kv_pos = 7;
 
 	template<typename Variant, typename T, size_t Pos>
-	inline constexpr bool validate_pos_value_v = std::is_same_v<
-	  daw::remove_cvref_t<decltype( std::get<Pos>( std::declval<Variant>( ) ) )>,
-	  T>;
+	inline constexpr bool validate_pos_value_v =
+	  std::is_same_v<daw::remove_cvref_t<decltype( std::get<Pos>( std::declval<Variant>( ) ) )>, T>;
 
 	template<typename... Ts>
 	struct pack_list {};
@@ -37,8 +36,7 @@ namespace daw::json_to_cpp::types::impl {
 	auto var_to_pack_impl( Variant<Args...> ) -> pack_list<Args...>;
 
 	template<typename Variant>
-	using var_to_pack_t =
-	  decltype( var_to_pack_impl( std::declval<Variant>( ) ) );
+	using var_to_pack_t = decltype( var_to_pack_impl( std::declval<Variant>( ) ) );
 
 	template<typename... Args0, typename... Args1>
 	constexpr bool are_same( pack_list<Args0...>, pack_list<Args1...> ) noexcept {
@@ -49,15 +47,21 @@ namespace daw::json_to_cpp::types::impl {
 		return ( std::is_same_v<Args0, Args1> and ... );
 	}
 
-	inline std::string format_member_name( daw::string_view name, bool use_cpp20,
-	                                       daw::string_view parent_name ) {
+	inline std::string
+	format_member_name( daw::string_view name, bool use_cpp20, daw::string_view parent_name ) {
 		if( use_cpp20 ) {
-			return "\"" + name + "\"";
+			std::string result = "\"";
+			result.reserve( name.size( ) + 2 );
+			result.append( std::data( name ), daw::data_end( name ) );
+			result += "\"";
+			return result;
 		}
 		if( parent_name.empty( ) ) {
-			return name;
+			return static_cast<std::string>( name );
 		}
-		std::string result = "mem_" + name;
+		std::string result = "mem_";
+		result.reserve( name.size( ) + 4 );
+		result.append( std::data( name ), daw::data_end( name ) );
 		return result;
 	}
 } // namespace daw::json_to_cpp::types::impl