зеркало из https://github.com/mono/ikvm-fork.git
Roll back previous accidental commit.
This commit is contained in:
Родитель
58c9e59ee3
Коммит
9bac1d38f3
|
@ -1583,9 +1583,9 @@ namespace IKVM.Internal
|
||||||
method.Link();
|
method.Link();
|
||||||
fields.Add(new GetterFieldWrapper(this, GetClassLoader().FieldTypeWrapperFromSig(f.Sig), null, f.Name, f.Sig, new ExModifiers((Modifiers)f.Modifiers, false), (MethodInfo)method.GetMethod(), null));
|
fields.Add(new GetterFieldWrapper(this, GetClassLoader().FieldTypeWrapperFromSig(f.Sig), null, f.Name, f.Sig, new ExModifiers((Modifiers)f.Modifiers, false), (MethodInfo)method.GetMethod(), null));
|
||||||
}
|
}
|
||||||
else if(true || (f.Modifiers & IKVM.Internal.MapXml.MapModifiers.Static) != 0)
|
else if((f.Modifiers & IKVM.Internal.MapXml.MapModifiers.Static) != 0)
|
||||||
{
|
{
|
||||||
FieldAttributes attr = MapFieldAccessModifiers(f.Modifiers);// | FieldAttributes.Static;
|
FieldAttributes attr = MapFieldAccessModifiers(f.Modifiers) | FieldAttributes.Static;
|
||||||
if(f.Constant != null)
|
if(f.Constant != null)
|
||||||
{
|
{
|
||||||
attr |= FieldAttributes.Literal;
|
attr |= FieldAttributes.Literal;
|
||||||
|
@ -1594,10 +1594,6 @@ namespace IKVM.Internal
|
||||||
{
|
{
|
||||||
attr |= FieldAttributes.InitOnly;
|
attr |= FieldAttributes.InitOnly;
|
||||||
}
|
}
|
||||||
if((f.Modifiers & IKVM.Internal.MapXml.MapModifiers.Static) != 0)
|
|
||||||
{
|
|
||||||
attr |= FieldAttributes.Static;
|
|
||||||
}
|
|
||||||
FieldBuilder fb = tb.DefineField(f.Name, GetClassLoader().FieldTypeWrapperFromSig(f.Sig).TypeAsSignatureType, attr);
|
FieldBuilder fb = tb.DefineField(f.Name, GetClassLoader().FieldTypeWrapperFromSig(f.Sig).TypeAsSignatureType, attr);
|
||||||
if(f.Attributes != null)
|
if(f.Attributes != null)
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче