Skip to content

Commit 9ffd6f0

Browse files
authored
Merge pull request #185 from wravery/next
Minor fixes from testing with the vcpkg port and gqlmapi
2 parents f05a238 + 7952633 commit 9ffd6f0

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

include/graphqlservice/GraphQLService.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,9 +663,11 @@ struct ModifiedArgument
663663

664664
// Peel off the none modifier. If it's included, it should always be last in the list.
665665
template <TypeModifier Modifier = TypeModifier::None, TypeModifier... Other>
666-
static typename std::enable_if_t<TypeModifier::None == Modifier && sizeof...(Other) == 0, Type>
667-
require(std::string_view name, const response::Value& arguments)
666+
static typename std::enable_if_t<TypeModifier::None == Modifier, Type> require(
667+
std::string_view name, const response::Value& arguments)
668668
{
669+
static_assert(sizeof...(Other) == 0, "None modifier should always be last");
670+
669671
// Just call through to the non-template method without the modifiers.
670672
return require(name, arguments);
671673
}

src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ install(FILES
452452
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Awaitable.h
453453
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Base64.h
454454
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Grammar.h
455+
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Introspection.h
455456
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Schema.h
456457
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SortedMap.h
457458
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SyntaxTree.h

src/SchemaGenerator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2874,7 +2874,7 @@ using namespace std::literals;
28742874

28752875
if (!_loader.isIntrospection())
28762876
{
2877-
if (!objectType.interfaces.empty())
2877+
if (!objectType.interfaces.empty() || !objectType.unions.empty())
28782878
{
28792879
NamespaceScope implementsNamespace { headerFile, R"cpp(implements)cpp" };
28802880

0 commit comments

Comments
 (0)