Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor fixes from testing with the vcpkg port and gqlmapi #185

Merged
merged 3 commits into from
Dec 15, 2021
Merged

Minor fixes from testing with the vcpkg port and gqlmapi #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b324eb4
Output include statements for unions even if no interfaces
wravery Dec 15, 2021
29eeba4
Install Introspection.h under graphqlservice/internal/
wravery Dec 15, 2021
7952633
Use a static_assert for the None modifier in ModifiedArgument too
wravery Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions include/graphqlservice/GraphQLService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,9 +663,11 @@ struct ModifiedArgument

// Peel off the none modifier. If it's included, it should always be last in the list.
template <TypeModifier Modifier = TypeModifier::None, TypeModifier... Other>
static typename std::enable_if_t<TypeModifier::None == Modifier && sizeof...(Other) == 0, Type>
require(std::string_view name, const response::Value& arguments)
static typename std::enable_if_t<TypeModifier::None == Modifier, Type> require(
std::string_view name, const response::Value& arguments)
{
static_assert(sizeof...(Other) == 0, "None modifier should always be last");

// Just call through to the non-template method without the modifiers.
return require(name, arguments);
}
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,7 @@ install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Awaitable.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Base64.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Grammar.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Introspection.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/Schema.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SortedMap.h
${CMAKE_CURRENT_SOURCE_DIR}/../include/graphqlservice/internal/SyntaxTree.h
Expand Down
2 changes: 1 addition & 1 deletion src/SchemaGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2874,7 +2874,7 @@ using namespace std::literals;

if (!_loader.isIntrospection())
{
if (!objectType.interfaces.empty())
if (!objectType.interfaces.empty() || !objectType.unions.empty())
{
NamespaceScope implementsNamespace { headerFile, R"cpp(implements)cpp" };

Expand Down