Merge pull request #321 from RAOF/aot-cpu-safety

[mono.git] / mcs / class / corlib / System.Reflection.Emit / EnumBuilder.cs

diff --git a/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs
index 8b851bb84beae14affcd925f9600cdaa43d64fed..2e3523a2d1934f8522a8ed137552a398df36d31f 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs
@@ -62,12 +62,12 @@ namespace System.Reflection.Emit {
                        return _tb;
                }
 
-               internal override bool IsCompilerContext {
-                       get {
-                               return _tb.IsCompilerContext;
-                       }
+               internal override Type InternalResolve ()
+               {
+                       return _tb.InternalResolve (); 
                }
 
+
                public override Assembly Assembly {
                        get {
                                return _tb.Assembly;
@@ -158,6 +158,13 @@ namespace System.Reflection.Emit {
                        return res;
                }
 
+#if NET_4_0
+               public override Type GetEnumUnderlyingType ()
+               {
+                       return _underlyingType;
+               }
+#endif
+
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                private extern void setup_enum_type (Type t);