Copy shared_ptr which can shift

Author: wravery

include/graphqlservice/GraphQLSchema.h

@@ -45,8 +45,8 @@ class Schema : public std::enable_shared_from_this<Schema>
 	GRAPHQLSERVICE_EXPORT void AddType(std::string_view name, std::shared_ptr<BaseType> type);
 	GRAPHQLSERVICE_EXPORT const std::shared_ptr<const BaseType>& LookupType(
 		std::string_view name) const;
-	GRAPHQLSERVICE_EXPORT const std::shared_ptr<const BaseType>& WrapType(
-		introspection::TypeKind kind, const std::shared_ptr<const BaseType>& ofType);
+	GRAPHQLSERVICE_EXPORT std::shared_ptr<const BaseType> WrapType(
+		introspection::TypeKind kind, std::shared_ptr<const BaseType> ofType);
 	GRAPHQLSERVICE_EXPORT void AddDirective(std::shared_ptr<Directive> directive);
 
 	// Accessors
@@ -282,7 +282,7 @@ class WrapperType : public BaseType
 	explicit WrapperType(init&& params);
 
 	GRAPHQLSERVICE_EXPORT static std::shared_ptr<WrapperType> Make(
-		introspection::TypeKind kind, const std::shared_ptr<const BaseType>& ofType);
+		introspection::TypeKind kind, std::weak_ptr<const BaseType> ofType);
 
 	// Accessors
 	GRAPHQLSERVICE_EXPORT const std::weak_ptr<const BaseType>& ofType() const noexcept final;
@@ -303,7 +303,7 @@ class Field : public std::enable_shared_from_this<Field>
 
 	GRAPHQLSERVICE_EXPORT static std::shared_ptr<Field> Make(std::string_view name,
 		std::string_view description, std::optional<std::string_view> deprecationReason,
-		const std::shared_ptr<const BaseType>& type,
+		std::weak_ptr<const BaseType> type,
 		std::initializer_list<std::shared_ptr<InputValue>> args = {});
 
 	// Accessors
@@ -333,7 +333,7 @@ class InputValue : public std::enable_shared_from_this<InputValue>
 	explicit InputValue(init&& params);
 
 	GRAPHQLSERVICE_EXPORT static std::shared_ptr<InputValue> Make(std::string_view name,
-		std::string_view description, const std::shared_ptr<const BaseType>& type,
+		std::string_view description, std::weak_ptr<const BaseType> type,
 		std::string_view defaultValue);
 
 	// Accessors

src/GraphQLSchema.cpp

@@ -60,8 +60,8 @@ const std::shared_ptr<const BaseType>& Schema::LookupType(std::string_view name)
 	return _types[itr->second].second;
 }
 
-const std::shared_ptr<const BaseType>& Schema::WrapType(
-	introspection::TypeKind kind, const std::shared_ptr<const BaseType>& ofType)
+std::shared_ptr<const BaseType> Schema::WrapType(
+	introspection::TypeKind kind, std::shared_ptr<const BaseType> ofType)
 {
 	auto& wrappers = (kind == introspection::TypeKind::LIST) ? _listWrappers : _nonNullWrappers;
 	auto itr = wrappers.find(ofType);
@@ -387,18 +387,18 @@ const std::vector<std::shared_ptr<const InputValue>>& InputObjectType::inputFiel
 struct WrapperType::init
 {
 	introspection::TypeKind kind;
-	const std::shared_ptr<const BaseType>& ofType;
+	std::weak_ptr<const BaseType> ofType;
 };
 
 std::shared_ptr<WrapperType> WrapperType::Make(
-	introspection::TypeKind kind, const std::shared_ptr<const BaseType>& ofType)
+	introspection::TypeKind kind, std::weak_ptr<const BaseType> ofType)
 {
-	return std::make_shared<WrapperType>(init { kind, ofType });
+	return std::make_shared<WrapperType>(init { kind, std::move(ofType) });
 }
 
 WrapperType::WrapperType(init&& params)
 	: BaseType(params.kind, std::string_view())
-	, _ofType(params.ofType)
+	, _ofType(std::move(params.ofType))
 {
 }
 
@@ -412,15 +412,15 @@ struct Field::init
 	std::string_view name;
 	std::string_view description;
 	std::optional<std::string_view> deprecationReason;
-	const std::shared_ptr<const BaseType>& type;
+	std::weak_ptr<const BaseType> type;
 	std::vector<std::shared_ptr<const InputValue>> args;
 };
 
 std::shared_ptr<Field> Field::Make(std::string_view name, std::string_view description,
-	std::optional<std::string_view> deprecationReason, const std::shared_ptr<const BaseType>& type,
+	std::optional<std::string_view> deprecationReason, std::weak_ptr<const BaseType> type,
 	std::initializer_list<std::shared_ptr<InputValue>> args)
 {
-	init params { name, description, deprecationReason, type };
+	init params { name, description, deprecationReason, std::move(type) };
 
 	params.args.resize(args.size());
 	std::copy(args.begin(), args.end(), params.args.begin());
@@ -432,7 +432,7 @@ Field::Field(init&& params)
 	: _name(params.name)
 	, _description(params.description)
 	, _deprecationReason(params.deprecationReason)
-	, _type(params.type)
+	, _type(std::move(params.type))
 	, _args(std::move(params.args))
 {
 }
@@ -466,20 +466,20 @@ struct InputValue::init
 {
 	std::string_view name;
 	std::string_view description;
-	const std::shared_ptr<const BaseType>& type;
+	std::weak_ptr<const BaseType> type;
 	std::string_view defaultValue;
 };
 
 std::shared_ptr<InputValue> InputValue::Make(std::string_view name, std::string_view description,
-	const std::shared_ptr<const BaseType>& type, std::string_view defaultValue)
+	std::weak_ptr<const BaseType> type, std::string_view defaultValue)
 {
-	return std::make_shared<InputValue>(init { name, description, type, defaultValue });
+	return std::make_shared<InputValue>(init { name, description, std::move(type), defaultValue });
 }
 
 InputValue::InputValue(init&& params)
 	: _name(params.name)
 	, _description(params.description)
-	, _type(params.type)
+	, _type(std::move(params.type))
 	, _defaultValue(params.defaultValue)
 {
 }