Skip to content

Fix build using GCC #28

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

Merged
Kenny Kerr (kennykerr) merged 2 commits into from
Nov 27, 2022
Merged

Fix build using GCC #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc38dd0
Fix GCC build without -fpermissive
alvinhochun Nov 26, 2022
d008fb5
Add `#include <utility>`
alvinhochun Nov 26, 2022
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
1 change: 1 addition & 0 deletions src/impl/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <vector>
#include <set>
#include <filesystem>
#include <utility>

#if defined(_DEBUG)
#define XLANG_DEBUG
Expand Down
76 changes: 38 additions & 38 deletions src/impl/winmd_reader/database.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,44 +119,44 @@ namespace winmd::reader
initialize();
}

table<TypeRef> TypeRef{ this };
table<GenericParamConstraint> GenericParamConstraint{ this };
table<TypeSpec> TypeSpec{ this };
table<TypeDef> TypeDef{ this };
table<CustomAttribute> CustomAttribute{ this };
table<MethodDef> MethodDef{ this };
table<MemberRef> MemberRef{ this };
table<Module> Module{ this };
table<Param> Param{ this };
table<InterfaceImpl> InterfaceImpl{ this };
table<Constant> Constant{ this };
table<Field> Field{ this };
table<FieldMarshal> FieldMarshal{ this };
table<DeclSecurity> DeclSecurity{ this };
table<ClassLayout> ClassLayout{ this };
table<FieldLayout> FieldLayout{ this };
table<StandAloneSig> StandAloneSig{ this };
table<EventMap> EventMap{ this };
table<Event> Event{ this };
table<PropertyMap> PropertyMap{ this };
table<Property> Property{ this };
table<MethodSemantics> MethodSemantics{ this };
table<MethodImpl> MethodImpl{ this };
table<ModuleRef> ModuleRef{ this };
table<ImplMap> ImplMap{ this };
table<FieldRVA> FieldRVA{ this };
table<Assembly> Assembly{ this };
table<AssemblyProcessor> AssemblyProcessor{ this };
table<AssemblyOS> AssemblyOS{ this };
table<AssemblyRef> AssemblyRef{ this };
table<AssemblyRefProcessor> AssemblyRefProcessor{ this };
table<AssemblyRefOS> AssemblyRefOS{ this };
table<File> File{ this };
table<ExportedType> ExportedType{ this };
table<ManifestResource> ManifestResource{ this };
table<NestedClass> NestedClass{ this };
table<GenericParam> GenericParam{ this };
table<MethodSpec> MethodSpec{ this };
table<reader::TypeRef> TypeRef{ this };
table<reader::GenericParamConstraint> GenericParamConstraint{ this };
table<reader::TypeSpec> TypeSpec{ this };
table<reader::TypeDef> TypeDef{ this };
table<reader::CustomAttribute> CustomAttribute{ this };
table<reader::MethodDef> MethodDef{ this };
table<reader::MemberRef> MemberRef{ this };
table<reader::Module> Module{ this };
table<reader::Param> Param{ this };
table<reader::InterfaceImpl> InterfaceImpl{ this };
table<reader::Constant> Constant{ this };
table<reader::Field> Field{ this };
table<reader::FieldMarshal> FieldMarshal{ this };
table<reader::DeclSecurity> DeclSecurity{ this };
table<reader::ClassLayout> ClassLayout{ this };
table<reader::FieldLayout> FieldLayout{ this };
table<reader::StandAloneSig> StandAloneSig{ this };
table<reader::EventMap> EventMap{ this };
table<reader::Event> Event{ this };
table<reader::PropertyMap> PropertyMap{ this };
table<reader::Property> Property{ this };
table<reader::MethodSemantics> MethodSemantics{ this };
table<reader::MethodImpl> MethodImpl{ this };
table<reader::ModuleRef> ModuleRef{ this };
table<reader::ImplMap> ImplMap{ this };
table<reader::FieldRVA> FieldRVA{ this };
table<reader::Assembly> Assembly{ this };
table<reader::AssemblyProcessor> AssemblyProcessor{ this };
table<reader::AssemblyOS> AssemblyOS{ this };
table<reader::AssemblyRef> AssemblyRef{ this };
table<reader::AssemblyRefProcessor> AssemblyRefProcessor{ this };
table<reader::AssemblyRefOS> AssemblyRefOS{ this };
table<reader::File> File{ this };
table<reader::ExportedType> ExportedType{ this };
table<reader::ManifestResource> ManifestResource{ this };
table<reader::NestedClass> NestedClass{ this };
table<reader::GenericParam> GenericParam{ this };
table<reader::MethodSpec> MethodSpec{ this };

template <typename T>
table<T> const& get_table() const noexcept;
Expand Down
6 changes: 3 additions & 3 deletions src/impl/winmd_reader/flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,15 @@ namespace winmd::reader

struct MethodImplAttributes : impl::AttributesBase<uint16_t>
{
constexpr CodeType CodeType() const noexcept
constexpr reader::CodeType CodeType() const noexcept
{
return get_enum<reader::CodeType>(CodeType_mask);
}
void CodeType(reader::CodeType arg) noexcept
{
set_enum(arg, CodeType_mask);
}
constexpr Managed Managed() const noexcept
constexpr reader::Managed Managed() const noexcept
{
return get_enum<reader::Managed>(Managed_mask);
}
Expand Down Expand Up @@ -600,7 +600,7 @@ namespace winmd::reader
{
set_bit(arg, WindowsRuntime_bit);
}
constexpr StringFormat StringFormat() const noexcept
constexpr reader::StringFormat StringFormat() const noexcept
{
return get_enum<reader::StringFormat>(StringFormat_mask);
}
Expand Down
6 changes: 3 additions & 3 deletions src/impl/winmd_reader/index.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ namespace winmd::reader
{
using index_base<TypeDefOrRef>::index_base;

TypeDef TypeDef() const;
TypeRef TypeRef() const;
TypeSpec TypeSpec() const;
reader::TypeDef TypeDef() const;
reader::TypeRef TypeRef() const;
reader::TypeSpec TypeSpec() const;
auto CustomAttribute() const;
};
}