Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -348,8 +348,10 @@ namespace Mono.ILASM {
if (IsValueType (parent.PeapiClass.nameSpace, parent.PeapiClass.name))
is_value_class = true;
else if (IsEnumType (parent.PeapiClass.nameSpace, parent.PeapiClass.name))
else if (IsEnumType (parent.PeapiClass.nameSpace, parent.PeapiClass.name)) {
is_enum_class = true;
is_value_class = false;
}
if (!IsValueType (name_space, name) && !IsEnumType (name_space, name) &&
is_value_class && (attr & PEAPI.TypeAttr.Sealed) == 0) {

View File

@@ -1,6 +1,8 @@
// InstrToken.cs
// Author: Sergey Chaban (serge@wildwestsoftware.com)
#if !MOBILE
using System;
using System.Reflection.Emit;
@@ -103,3 +105,5 @@ namespace Mono.ILASM {
}
}
#endif