Skip to content

Commit 39cf543

Browse files
DefaultRyanDefaultRyan
committed
Bring local winmd changes up to date with official
1 parent e436ad2 commit 39cf543

File tree

4 files changed

+45
-44
lines changed

4 files changed

+45
-44
lines changed

‎natvis/winmd/impl/base.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <vector>
2727
#include <set>
2828
#include <filesystem>
29+
#include <utility>
2930

3031
#if defined(_DEBUG)
3132
#define XLANG_DEBUG

‎natvis/winmd/impl/winmd_reader/database.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -119,44 +119,44 @@ namespace winmd::reader
119119
initialize();
120120
}
121121

122-
table<TypeRef> TypeRef{ this };
123-
table<GenericParamConstraint> GenericParamConstraint{ this };
124-
table<TypeSpec> TypeSpec{ this };
125-
table<TypeDef> TypeDef{ this };
126-
table<CustomAttribute> CustomAttribute{ this };
127-
table<MethodDef> MethodDef{ this };
128-
table<MemberRef> MemberRef{ this };
129-
table<Module> Module{ this };
130-
table<Param> Param{ this };
131-
table<InterfaceImpl> InterfaceImpl{ this };
132-
table<Constant> Constant{ this };
133-
table<Field> Field{ this };
134-
table<FieldMarshal> FieldMarshal{ this };
135-
table<DeclSecurity> DeclSecurity{ this };
136-
table<ClassLayout> ClassLayout{ this };
137-
table<FieldLayout> FieldLayout{ this };
138-
table<StandAloneSig> StandAloneSig{ this };
139-
table<EventMap> EventMap{ this };
140-
table<Event> Event{ this };
141-
table<PropertyMap> PropertyMap{ this };
142-
table<Property> Property{ this };
143-
table<MethodSemantics> MethodSemantics{ this };
144-
table<MethodImpl> MethodImpl{ this };
145-
table<ModuleRef> ModuleRef{ this };
146-
table<ImplMap> ImplMap{ this };
147-
table<FieldRVA> FieldRVA{ this };
148-
table<Assembly> Assembly{ this };
149-
table<AssemblyProcessor> AssemblyProcessor{ this };
150-
table<AssemblyOS> AssemblyOS{ this };
151-
table<AssemblyRef> AssemblyRef{ this };
152-
table<AssemblyRefProcessor> AssemblyRefProcessor{ this };
153-
table<AssemblyRefOS> AssemblyRefOS{ this };
154-
table<File> File{ this };
155-
table<ExportedType> ExportedType{ this };
156-
table<ManifestResource> ManifestResource{ this };
157-
table<NestedClass> NestedClass{ this };
158-
table<GenericParam> GenericParam{ this };
159-
table<MethodSpec> MethodSpec{ this };
122+
table<reader::TypeRef> TypeRef{ this };
123+
table<reader::GenericParamConstraint> GenericParamConstraint{ this };
124+
table<reader::TypeSpec> TypeSpec{ this };
125+
table<reader::TypeDef> TypeDef{ this };
126+
table<reader::CustomAttribute> CustomAttribute{ this };
127+
table<reader::MethodDef> MethodDef{ this };
128+
table<reader::MemberRef> MemberRef{ this };
129+
table<reader::Module> Module{ this };
130+
table<reader::Param> Param{ this };
131+
table<reader::InterfaceImpl> InterfaceImpl{ this };
132+
table<reader::Constant> Constant{ this };
133+
table<reader::Field> Field{ this };
134+
table<reader::FieldMarshal> FieldMarshal{ this };
135+
table<reader::DeclSecurity> DeclSecurity{ this };
136+
table<reader::ClassLayout> ClassLayout{ this };
137+
table<reader::FieldLayout> FieldLayout{ this };
138+
table<reader::StandAloneSig> StandAloneSig{ this };
139+
table<reader::EventMap> EventMap{ this };
140+
table<reader::Event> Event{ this };
141+
table<reader::PropertyMap> PropertyMap{ this };
142+
table<reader::Property> Property{ this };
143+
table<reader::MethodSemantics> MethodSemantics{ this };
144+
table<reader::MethodImpl> MethodImpl{ this };
145+
table<reader::ModuleRef> ModuleRef{ this };
146+
table<reader::ImplMap> ImplMap{ this };
147+
table<reader::FieldRVA> FieldRVA{ this };
148+
table<reader::Assembly> Assembly{ this };
149+
table<reader::AssemblyProcessor> AssemblyProcessor{ this };
150+
table<reader::AssemblyOS> AssemblyOS{ this };
151+
table<reader::AssemblyRef> AssemblyRef{ this };
152+
table<reader::AssemblyRefProcessor> AssemblyRefProcessor{ this };
153+
table<reader::AssemblyRefOS> AssemblyRefOS{ this };
154+
table<reader::File> File{ this };
155+
table<reader::ExportedType> ExportedType{ this };
156+
table<reader::ManifestResource> ManifestResource{ this };
157+
table<reader::NestedClass> NestedClass{ this };
158+
table<reader::GenericParam> GenericParam{ this };
159+
table<reader::MethodSpec> MethodSpec{ this };
160160

161161
template <typename T>
162162
table<T> const& get_table() const noexcept;

‎natvis/winmd/impl/winmd_reader/flags.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,15 @@ namespace winmd::reader
303303

304304
struct MethodImplAttributes : impl::AttributesBase<uint16_t>
305305
{
306-
constexpr CodeType CodeType() const noexcept
306+
constexpr reader::CodeType CodeType() const noexcept
307307
{
308308
return get_enum<reader::CodeType>(CodeType_mask);
309309
}
310310
void CodeType(reader::CodeType arg) noexcept
311311
{
312312
set_enum(arg, CodeType_mask);
313313
}
314-
constexpr Managed Managed() const noexcept
314+
constexpr reader::Managed Managed() const noexcept
315315
{
316316
return get_enum<reader::Managed>(Managed_mask);
317317
}
@@ -600,7 +600,7 @@ namespace winmd::reader
600600
{
601601
set_bit(arg, WindowsRuntime_bit);
602602
}
603-
constexpr StringFormat StringFormat() const noexcept
603+
constexpr reader::StringFormat StringFormat() const noexcept
604604
{
605605
return get_enum<reader::StringFormat>(StringFormat_mask);
606606
}

‎natvis/winmd/impl/winmd_reader/index.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ namespace winmd::reader
4848
{
4949
using index_base<TypeDefOrRef>::index_base;
5050

51-
TypeDef TypeDef() const;
52-
TypeRef TypeRef() const;
53-
TypeSpec TypeSpec() const;
51+
reader::TypeDef TypeDef() const;
52+
reader::TypeRef TypeRef() const;
53+
reader::TypeSpec TypeSpec() const;
5454
auto CustomAttribute() const;
5555
};
5656
}

0 commit comments

Comments
 (0)