Fixing bugs and CI workflows

.github/workflows/macos.yml

@@ -9,7 +9,7 @@ jobs:
       matrix:
         config: [Debug, Release]
 
-    runs-on: macos-11
+    runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v2
@@ -31,7 +31,7 @@ jobs:
       shell: pwsh
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT './scripts/buildsystems/vcpkg.cmake' -Resolve
         $cmakeBuildType = '${{ matrix.config }}'
 
         cmake "-DCMAKE_TOOLCHAIN_FILE=$vcpkgToolchain" "-DCMAKE_BUILD_TYPE=$cmakeBuildType" ${{ github.workspace }}

.github/workflows/windows.yml

@@ -38,7 +38,7 @@ jobs:
       shell: pwsh
       working-directory: build/
       run: |
-        $vcpkgToolchain = Join-Path $env:VCPKG_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
+        $vcpkgToolchain = Join-Path $env:VCPKG_INSTALLATION_ROOT '.\scripts\buildsystems\vcpkg.cmake' -Resolve
         $vcpkgTriplet = '${{ steps.set-variables.outputs.vcpkg_triplet }}'
         $cmakeSharedLibs = $(if ('${{ matrix.libs }}' -eq 'shared') { 'ON' } else { 'OFF' })
         $msbuildArch = $(if ('${{ matrix.arch }}' -eq 'x64') { 'X64' } else { 'Win32' })

include/graphqlservice/GraphQLService.h

@@ -116,7 +116,7 @@ struct [[nodiscard]] RequestState : std::enable_shared_from_this<RequestState>
 	virtual ~RequestState() = default;
 };
 
-namespace {
+inline namespace keywords {
 
 using namespace std::literals;
 
@@ -131,7 +131,7 @@ constexpr std::string_view strQuery { "query"sv };
 constexpr std::string_view strMutation { "mutation"sv };
 constexpr std::string_view strSubscription { "subscription"sv };
 
-} // namespace
+} // namespace keywords
 
 // Resolvers may be called in multiple different Operation contexts.
 enum class [[nodiscard]] ResolverContext {

samples/client/multiple/MultipleQueriesClient.cpp

@@ -151,11 +151,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 
 CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)
 {
-	CompleteTaskInput value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = CompleteTaskInput { other };
 }
 
 CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexcept

samples/client/mutate/MutateClient.cpp

@@ -84,11 +84,7 @@ CompleteTaskInput::CompleteTaskInput(CompleteTaskInput&& other) noexcept
 
 CompleteTaskInput& CompleteTaskInput::operator=(const CompleteTaskInput& other)
 {
-	CompleteTaskInput value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = CompleteTaskInput { other };
 }
 
 CompleteTaskInput& CompleteTaskInput::operator=(CompleteTaskInput&& other) noexcept

samples/client/nestedinput/NestedInputClient.cpp

@@ -66,11 +66,7 @@ InputA::InputA(InputA&& other) noexcept
 
 InputA& InputA::operator=(const InputA& other)
 {
-	InputA value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputA { other };
 }
 
 InputA& InputA::operator=(InputA&& other) noexcept
@@ -98,11 +94,7 @@ InputB::InputB(InputB&& other) noexcept
 
 InputB& InputB::operator=(const InputB& other)
 {
-	InputB value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputB { other };
 }
 
 InputB& InputB::operator=(InputB&& other) noexcept
@@ -116,11 +108,13 @@ InputABCD::InputABCD(
 		std::string dArg,
 		InputA aArg,
 		InputB bArg,
-		std::vector<InputBC> bcArg) noexcept
+		std::vector<InputBC> bcArg,
+		int valueArg) noexcept
 	: d { std::move(dArg) }
 	, a { std::move(aArg) }
 	, b { std::move(bArg) }
 	, bc { std::move(bcArg) }
+	, value { std::move(valueArg) }
 {
 }
 
@@ -129,6 +123,7 @@ InputABCD::InputABCD(const InputABCD& other)
 	, a { ModifiedVariable<InputA>::duplicate(other.a) }
 	, b { ModifiedVariable<InputB>::duplicate(other.b) }
 	, bc { ModifiedVariable<InputBC>::duplicate<TypeModifier::List>(other.bc) }
+	, value { ModifiedVariable<int>::duplicate(other.value) }
 {
 }
 
@@ -137,16 +132,13 @@ InputABCD::InputABCD(InputABCD&& other) noexcept
 	, a { std::move(other.a) }
 	, b { std::move(other.b) }
 	, bc { std::move(other.bc) }
+	, value { std::move(other.value) }
 {
 }
 
 InputABCD& InputABCD::operator=(const InputABCD& other)
 {
-	InputABCD value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputABCD { other };
 }
 
 InputABCD& InputABCD::operator=(InputABCD&& other) noexcept
@@ -155,6 +147,7 @@ InputABCD& InputABCD::operator=(InputABCD&& other) noexcept
 	a = std::move(other.a);
 	b = std::move(other.b);
 	bc = std::move(other.bc);
+	value = std::move(other.value);
 
 	return *this;
 }
@@ -181,11 +174,7 @@ InputBC::InputBC(InputBC&& other) noexcept
 
 InputBC& InputBC::operator=(const InputBC& other)
 {
-	InputBC value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = InputBC { other };
 }
 
 InputBC& InputBC::operator=(InputBC&& other) noexcept
@@ -229,6 +218,7 @@ response::Value Variable<InputABCD>::serialize(InputABCD&& inputValue)
 	result.emplace_back(R"js(a)js"s, ModifiedVariable<InputA>::serialize(std::move(inputValue.a)));
 	result.emplace_back(R"js(b)js"s, ModifiedVariable<InputB>::serialize(std::move(inputValue.b)));
 	result.emplace_back(R"js(bc)js"s, ModifiedVariable<InputBC>::serialize<TypeModifier::List>(std::move(inputValue.bc)));
+	result.emplace_back(R"js(value)js"s, ModifiedVariable<int>::serialize(std::move(inputValue.value)));
 
 	return result;
 }

samples/client/nestedinput/NestedInputClient.h

@@ -78,7 +78,8 @@ struct [[nodiscard]] InputABCD
 		std::string dArg = std::string {},
 		InputA aArg = InputA {},
 		InputB bArg = InputB {},
-		std::vector<InputBC> bcArg = std::vector<InputBC> {}) noexcept;
+		std::vector<InputBC> bcArg = std::vector<InputBC> {},
+		int valueArg = int {}) noexcept;
 	InputABCD(const InputABCD& other);
 	InputABCD(InputABCD&& other) noexcept;
 
@@ -89,6 +90,7 @@ struct [[nodiscard]] InputABCD
 	InputA a {};
 	InputB b {};
 	std::vector<InputBC> bc {};
+	int value {};
 };
 
 struct [[nodiscard]] InputBC

samples/client/nestedinput/schema.graphql

@@ -16,6 +16,7 @@ input InputABCD {
   a: InputA!
   b: InputB!
   bc: [InputBC!]!
+  value: Int!
 }
 
 type Output {

src/ClientGenerator.cpp

@@ -725,11 +725,7 @@ using namespace std::literals;
 )cpp" << cppType << R"cpp(& )cpp"
 					   << cppType << R"cpp(::operator=(const )cpp" << cppType << R"cpp(& other)
 {
-	)cpp" << cppType << R"cpp( value { other };
-
-	std::swap(*this, value);
-
-	return *this;
+	return *this = )cpp" << cppType << R"cpp( { other };
 }
 
 )cpp" << cppType << R"cpp(& )cpp"