Disambiguate move constructors and assignment

wravery · wravery · commit 773ef2a743c4 · 2022-05-07T12:19:38.000-07:00
diff --git a/include/graphqlservice/GraphQLResponse.h b/include/graphqlservice/GraphQLResponse.h
@@ -77,10 +77,7 @@ struct [[nodiscard]] IdType
 
 	// Conversion
 	GRAPHQLRESPONSE_EXPORT IdType(ByteData&& data) noexcept;
-	GRAPHQLRESPONSE_EXPORT IdType& operator=(ByteData&& data) noexcept;
-
 	GRAPHQLRESPONSE_EXPORT IdType(OpaqueString&& opaque) noexcept;
-	GRAPHQLRESPONSE_EXPORT IdType& operator=(OpaqueString&& opaque) noexcept;
 
 	template <typename ValueType>
 	[[nodiscard]] const ValueType& get() const;
diff --git a/src/GraphQLResponse.cpp b/src/GraphQLResponse.cpp
@@ -68,23 +68,11 @@ IdType::IdType(ByteData&& data) noexcept
 {
 }
 
-IdType& IdType::operator=(ByteData&& data) noexcept
-{
-	_data = { std::move(data) };
-	return *this;
-}
-
 IdType::IdType(OpaqueString&& opaque) noexcept
 	: _data { std::move(opaque) }
 {
 }
 
-IdType& IdType::operator=(OpaqueString&& opaque) noexcept
-{
-	_data = { std::move(opaque) };
-	return *this;
-}
-
 bool IdType::operator==(const IdType& rhs) const noexcept
 {
 	if (_data.index() == rhs._data.index())

Original file line number	Diff line number	Diff line change
`@@ -68,23 +68,11 @@ IdType::IdType(ByteData&& data) noexcept`
`68`	`68`	`{`
`69`	`69`	`}`
`70`	`70`
`71`		`-IdType& IdType::operator=(ByteData&& data) noexcept`
`72`		`-{`
`73`		`- _data = { std::move(data) };`
`74`		`- return *this;`
`75`		`-}`
`76`		`-`
`77`	`71`	`IdType::IdType(OpaqueString&& opaque) noexcept`
`78`	`72`	`: _data { std::move(opaque) }`
`79`	`73`	`{`
`80`	`74`	`}`
`81`	`75`
`82`		`-IdType& IdType::operator=(OpaqueString&& opaque) noexcept`
`83`		`-{`
`84`		`- _data = { std::move(opaque) };`
`85`		`- return *this;`
`86`		`-}`
`87`		`-`
`88`	`76`	`bool IdType::operator==(const IdType& rhs) const noexcept`
`89`	`77`	`{`
`90`	`78`	`if (_data.index() == rhs._data.index())`