Fix /W4 warnings for MSVC

wravery · wravery · commit c938c9259b00 · 2022-01-06T11:36:51.000-08:00
diff --git a/samples/today/sample.cpp b/samples/today/sample.cpp
@@ -61,21 +61,21 @@ int main(int argc, char** argv)
 
 	try
 	{
-		peg::ast query;
+		peg::ast ast;
 
 		if (argc > 1)
 		{
-			query = peg::parseFile(argv[1]);
+			ast = peg::parseFile(argv[1]);
 		}
 		else
 		{
 			std::istream_iterator<char> start { std::cin >> std::noskipws }, end {};
 			std::string input { start, end };
 
-			query = peg::parseString(std::move(input));
+			ast = peg::parseString(std::move(input));
 		}
 
-		if (!query.root)
+		if (!ast.root)
 		{
 			std::cerr << "Unknown error!" << std::endl;
 			std::cerr << std::endl;
@@ -85,7 +85,7 @@ int main(int argc, char** argv)
 		std::cout << "Executing query..." << std::endl;
 
 		std::cout << response::toJSON(
-			service->resolve({ query, ((argc > 2) ? argv[2] : "") }).get())
+			service->resolve({ ast, ((argc > 2) ? argv[2] : "") }).get())
 				  << std::endl;
 	}
 	catch (const std::runtime_error& ex)
diff --git a/src/ClientGenerator.cpp b/src/ClientGenerator.cpp
@@ -485,7 +485,6 @@ using namespace )cpp"
 		{
 			pendingSeparator.reset();
 
-			const auto& enumValues = enumType->enumValues();
 			const auto cppType = _schemaLoader.getCppType(enumType->name());
 
 			if (!variables.empty())
diff --git a/src/GeneratorUtil.cpp b/src/GeneratorUtil.cpp
@@ -21,7 +21,7 @@ IncludeGuardScope::IncludeGuardScope(
 				return '_';
 			}
 
-			return std::toupper(ch);
+			return static_cast<char>(std::toupper(ch));
 		});
 
 	_outputFile << R"cpp(// Copyright (c) Microsoft Corporation. All rights reserved.
diff --git a/src/GraphQLResponse.cpp b/src/GraphQLResponse.cpp
@@ -496,7 +496,7 @@ Value::Value(const Value& other)
 			std::transform(members.cbegin(),
 				members.cend(),
 				std::back_inserter(copy.members),
-				[&copy](const auto& entry) noexcept {
+				[](const auto& entry) noexcept {
 					return entry.second;
 				});
 
diff --git a/src/GraphQLService.cpp b/src/GraphQLService.cpp
@@ -1631,7 +1631,7 @@ std::pair<std::string_view, const peg::ast_node*> Request::findOperationDefiniti
 	std::pair<std::string_view, const peg::ast_node*> result = { {}, nullptr };
 
 	peg::on_first_child_if<peg::operation_definition>(*query.root,
-		[this, &operationName, &result](const peg::ast_node& operationDefinition) noexcept -> bool {
+		[&operationName, &result](const peg::ast_node& operationDefinition) noexcept -> bool {
 			std::string_view operationType = strQuery;
 
 			peg::on_first_child<peg::operation_type>(operationDefinition,
@@ -1706,7 +1706,7 @@ response::AwaitableValue Request::resolve(RequestResolveParams params) const
 		const auto resolverContext =
 			isMutation ? ResolverContext::Mutation : ResolverContext::Query;
 		// https://spec.graphql.org/October2021/#sec-Normal-and-Serial-Execution
-		const auto operationLaunch = isMutation ? await_async {} : params.launch;
+		auto operationLaunch = isMutation ? await_async {} : params.launch;
 
 		OperationDefinitionVisitor operationVisitor(resolverContext,
 			std::move(operationLaunch),
diff --git a/src/RequestLoader.cpp b/src/RequestLoader.cpp
@@ -473,7 +473,7 @@ void RequestLoader::addTypesToSchema()
 			std::transform(objectType.interfaces.cbegin(),
 				objectType.interfaces.cend(),
 				interfaces.begin(),
-				[this, &interfaceTypes](std::string_view interfaceName) noexcept {
+				[&interfaceTypes](std::string_view interfaceName) noexcept {
 					return interfaceTypes[interfaceName];
 				});
 
diff --git a/src/SchemaLoader.cpp b/src/SchemaLoader.cpp
@@ -1097,7 +1097,7 @@ void SchemaLoader::visitDirectiveDefinition(const peg::ast_node& directiveDefini
 		});
 
 	peg::on_first_child<peg::repeatable_keyword>(directiveDefinition,
-		[&directive](const peg::ast_node& child) {
+		[&directive](const peg::ast_node& /* child */) {
 			directive.isRepeatable = true;
 		});
 
diff --git a/src/Validation.cpp b/src/Validation.cpp
@@ -244,12 +244,12 @@ void ValidateArgumentValueVisitor::visitObjectValue(const peg::ast_node& objectV
 		if (value.values.find(name) != value.values.end())
 		{
 			// https://spec.graphql.org/October2021/#sec-Input-Object-Field-Uniqueness
-			auto position = field->begin();
+			auto fieldPosition = field->begin();
 			std::ostringstream message;
 
 			message << "Conflicting input field name: " << name;
 
-			_errors.push_back({ message.str(), { position.line, position.column } });
+			_errors.push_back({ message.str(), { fieldPosition.line, fieldPosition.column } });
 			continue;
 		}
 
@@ -567,7 +567,6 @@ void ValidateExecutableVisitor::visit(const peg::ast_node& root)
 	if (!_fragmentDefinitions.empty())
 	{
 		// https://spec.graphql.org/October2021/#sec-Fragments-Must-Be-Used
-		const size_t originalSize = _errors.size();
 		auto unreferencedFragments = std::move(_fragmentDefinitions);
 
 		for (const auto& name : _referencedFragments)
@@ -920,7 +919,7 @@ bool ValidateExecutableVisitor::matchesScopedType(std::string_view name) const
 	{
 		const auto itrMatch = std::find_if(itrScoped->second.begin(),
 			itrScoped->second.end(),
-			[this, itrNamed](std::string_view matchingType) noexcept {
+			[itrNamed](std::string_view matchingType) noexcept {
 				return itrNamed->second.find(matchingType) != itrNamed->second.end();
 			});
 
diff --git a/test/TodayTests.cpp b/test/TodayTests.cpp
@@ -661,7 +661,7 @@ TEST_F(TodayServiceCase, SubscribeNextAppointmentChangeOverride)
 	response::Value variables(response::Type::Map);
 	auto state = std::make_shared<today::RequestState>(7);
 	auto subscriptionObject = std::make_shared<today::NextAppointmentChange>(
-		[this](const std::shared_ptr<service::RequestState>& state)
+		[](const std::shared_ptr<service::RequestState>& state)
 			-> std::shared_ptr<today::Appointment> {
 			EXPECT_EQ(7, std::static_pointer_cast<today::RequestState>(state)->requestId)
 				<< "should pass the RequestState to the subscription resolvers";
@@ -1248,7 +1248,7 @@ TEST_F(TodayServiceCase, SubscribeNodeChangeMatchingId)
 	response::Value variables(response::Type::Map);
 	auto state = std::make_shared<today::RequestState>(13);
 	auto subscriptionObject = std::make_shared<today::NodeChange>(
-		[this](const std::shared_ptr<service::RequestState>& state,
+		[](const std::shared_ptr<service::RequestState>& state,
 			response::IdType&& idArg) -> std::shared_ptr<today::object::Node> {
 			EXPECT_EQ(13, std::static_pointer_cast<today::RequestState>(state)->requestId)
 				<< "should pass the RequestState to the subscription resolvers";
@@ -1316,8 +1316,8 @@ TEST_F(TodayServiceCase, SubscribeNodeChangeMismatchedId)
 	response::Value variables(response::Type::Map);
 	bool calledResolver = false;
 	auto subscriptionObject = std::make_shared<today::NodeChange>(
-		[this, &calledResolver](const std::shared_ptr<service::RequestState>& state,
-			response::IdType&& idArg) -> std::shared_ptr<today::object::Node> {
+		[&calledResolver](const std::shared_ptr<service::RequestState>& /* state */,
+			response::IdType&& /* idArg */) -> std::shared_ptr<today::object::Node> {
 			calledResolver = true;
 			return nullptr;
 		});
@@ -1373,7 +1373,7 @@ TEST_F(TodayServiceCase, SubscribeNodeChangeFuzzyComparator)
 		return true;
 	};
 	auto subscriptionObject = std::make_shared<today::NodeChange>(
-		[this](const std::shared_ptr<service::RequestState>& state,
+		[](const std::shared_ptr<service::RequestState>& state,
 			response::IdType&& idArg) -> std::shared_ptr<today::object::Node> {
 			const response::IdType fuzzyId { 'f', 'a', 'k' };
 
@@ -1453,8 +1453,8 @@ TEST_F(TodayServiceCase, SubscribeNodeChangeFuzzyMismatch)
 	};
 	bool calledResolver = false;
 	auto subscriptionObject = std::make_shared<today::NodeChange>(
-		[this, &calledResolver](const std::shared_ptr<service::RequestState>& state,
-			response::IdType&& idArg) -> std::shared_ptr<today::object::Node> {
+		[&calledResolver](const std::shared_ptr<service::RequestState>& /* state */,
+			response::IdType&& /* idArg */) -> std::shared_ptr<today::object::Node> {
 			calledResolver = true;
 			return nullptr;
 		});
@@ -1503,7 +1503,7 @@ TEST_F(TodayServiceCase, SubscribeNodeChangeMatchingVariable)
 	variables.emplace_back("taskId", response::Value("ZmFrZVRhc2tJZA=="s));
 	auto state = std::make_shared<today::RequestState>(14);
 	auto subscriptionObject = std::make_shared<today::NodeChange>(
-		[this](const std::shared_ptr<service::RequestState>& state,
+		[](const std::shared_ptr<service::RequestState>& state,
 			response::IdType&& idArg) -> std::shared_ptr<today::object::Node> {
 			EXPECT_EQ(14, std::static_pointer_cast<today::RequestState>(state)->requestId)
 				<< "should pass the RequestState to the subscription resolvers";
@@ -1917,7 +1917,7 @@ TEST_F(TodayServiceCase, SubscribeUnsubscribeNotificationsAsync)
 		today::NextAppointmentChange::getCount(service::ResolverContext::NotifyUnsubscribe);
 	auto key = _service
 				   ->subscribe({
-					   [&calledCallback](response::Value&& response) {
+					   [&calledCallback](response::Value&& /* response */) {
 						   calledCallback = true;
 					   },
 					   std::move(query),
@@ -1970,7 +1970,7 @@ TEST_F(TodayServiceCase, SubscribeUnsubscribeNotificationsDeferred)
 	const auto notifyUnsubscribeBegin =
 		today::NextAppointmentChange::getCount(service::ResolverContext::NotifyUnsubscribe);
 	auto key = _service
-				   ->subscribe({ [&calledCallback](response::Value&& response) {
+				   ->subscribe({ [&calledCallback](response::Value&& /* response */) {
 									calledCallback = true;
 								},
 					   std::move(query),

Original file line number	Diff line number	Diff line change
`@@ -61,21 +61,21 @@ int main(int argc, char** argv)`
`61`	`61`
`62`	`62`	`try`
`63`	`63`	`{`
`64`		`- peg::ast query;`
	`64`	`+ peg::ast ast;`
`65`	`65`
`66`	`66`	`if (argc > 1)`
`67`	`67`	`{`
`68`		`- query = peg::parseFile(argv[1]);`
	`68`	`+ ast = peg::parseFile(argv[1]);`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
`72`	`72`	`std::istream_iterator<char> start { std::cin >> std::noskipws }, end {};`
`73`	`73`	`std::string input { start, end };`
`74`	`74`
`75`		`- query = peg::parseString(std::move(input));`
	`75`	`+ ast = peg::parseString(std::move(input));`
`76`	`76`	`}`
`77`	`77`
`78`		`- if (!query.root)`
	`78`	`+ if (!ast.root)`
`79`	`79`	`{`
`80`	`80`	`std::cerr << "Unknown error!" << std::endl;`
`81`	`81`	`std::cerr << std::endl;`
`@@ -85,7 +85,7 @@ int main(int argc, char** argv)`
`85`	`85`	`std::cout << "Executing query..." << std::endl;`
`86`	`86`
`87`	`87`	`std::cout << response::toJSON(`
`88`		`- service->resolve({ query, ((argc > 2) ? argv[2] : "") }).get())`
	`88`	`+ service->resolve({ ast, ((argc > 2) ? argv[2] : "") }).get())`
`89`	`89`	`<< std::endl;`
`90`	`90`	`}`
`91`	`91`	`catch (const std::runtime_error& ex)`
Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,6 @@ using namespace )cpp"`
`485`	`485`	`{`
`486`	`486`	`pendingSeparator.reset();`
`487`	`487`
`488`		`- const auto& enumValues = enumType->enumValues();`
`489`	`488`	`const auto cppType = _schemaLoader.getCppType(enumType->name());`
`490`	`489`
`491`	`490`	`if (!variables.empty())`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ IncludeGuardScope::IncludeGuardScope(`
`21`	`21`	`return '_';`
`22`	`22`	`}`
`23`	`23`
`24`		`- return std::toupper(ch);`
	`24`	`+ return static_cast<char>(std::toupper(ch));`
`25`	`25`	`});`
`26`	`26`
`27`	`27`	`_outputFile << R"cpp(// Copyright (c) Microsoft Corporation. All rights reserved.`