Merge pull request #704 from jgagnon/master

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

diff --git a/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs b/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs
index 6eaed71adf8af9b8b0a8bc9c6767acad612ca4db..924eb674e154ef2c487f892e5d54a897fa502f3c 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs
@@ -31,6 +31,7 @@
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
+#if !FULL_AOT_RUNTIME
 using System;
 using System.Reflection;
 using System.Reflection.Emit;
@@ -42,6 +43,7 @@ namespace System.Reflection.Emit {
        [ComVisible (true)]
        [ComDefaultInterface (typeof (_SignatureHelper))]
        [ClassInterface (ClassInterfaceType.None)]
+       [StructLayout (LayoutKind.Sequential)]
        public sealed class SignatureHelper : _SignatureHelper {
                internal enum SignatureHelperType {
                        HELPER_FIELD,
@@ -112,12 +114,37 @@ namespace System.Reflection.Emit {
                {
                        return GetMethodSigHelper (mod, CallingConventions.Standard, (CallingConvention)0, returnType, parameterTypes);
                }
+
                [MonoTODO("Not implemented")]
                public static SignatureHelper GetPropertySigHelper (Module mod, Type returnType, Type[] parameterTypes)
                {
                        throw new NotImplementedException ();
                }
 
+               [MonoTODO("Not implemented")]
+               public static SignatureHelper GetPropertySigHelper (Module mod, Type returnType,
+                                                                   Type [] requiredReturnTypeCustomModifiers,
+                                                                   Type [] optionalReturnTypeCustomModifiers,
+                                                                   Type [] parameterTypes,
+                                                                   Type [] [] requiredParameterTypeCustomModifiers,
+                                                                   Type [] [] optionalParameterTypeCustomModifiers)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO("Not implemented")]
+               public static SignatureHelper GetPropertySigHelper (Module mod,
+                                                                       CallingConventions callingConvention,
+                                                                       Type returnType,
+                                                                   Type [] requiredReturnTypeCustomModifiers,
+                                                                   Type [] optionalReturnTypeCustomModifiers,
+                                                                   Type [] parameterTypes,
+                                                                   Type [] [] requiredParameterTypeCustomModifiers,
+                                                                   Type [] [] optionalParameterTypeCustomModifiers)
+               {
+                       throw new NotImplementedException ();
+               }
+
                //
                // Grows the given array, and returns the index where the element
                // was added
@@ -235,17 +262,6 @@ namespace System.Reflection.Emit {
                                AppendArrayAt (ref modopts, optionalCustomModifiers, p);
                }
 
-               [MonoTODO("Not implemented")]
-               public static SignatureHelper GetPropertySigHelper (Module mod, Type returnType,
-                                                                   Type [] requiredReturnTypeCustomModifiers,
-                                                                   Type [] optionalReturnTypeCustomModifiers,
-                                                                   Type [] parameterTypes,
-                                                                   Type [] [] requiredParameterTypeCustomModifiers,
-                                                                   Type [] [] optionalParameterTypeCustomModifiers)
-               {
-                       throw new NotImplementedException ();
-               }
-
                public void AddArgument (Type clsArgument)
                {
                        if (clsArgument == null)
@@ -413,3 +429,4 @@ namespace System.Reflection.Emit {
                 }
        }
 }
+#endif