Merge pull request #1718 from madewokherd/sgenthreadcleanup

[mono.git] / mcs / class / corlib / System.Runtime.InteropServices / UCOMIMoniker.cs

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs
index d0e8b658b35f55bf0eee884185e4568128a6ad29..08f7e4d176e6ea3d2576565cf69ccfdbb6e2829e 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIMoniker.cs
@@ -28,20 +28,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+#if !FULL_AOT_RUNTIME
 namespace System.Runtime.InteropServices
 {
-#if NET_2_0
        [Obsolete]
        [ComImport]
-#endif
        [Guid ("0000000f-0000-0000-c000-000000000046")]
        [InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]
        public interface UCOMIMoniker
        {
                void GetClassID (out Guid pClassID);
-#if NET_2_0
                [PreserveSig]
-#endif
                int IsDirty ();
                void Load (UCOMIStream pStm);
                void Save (UCOMIStream pStm, [MarshalAs (UnmanagedType.Bool)] bool fClearDirty);
@@ -49,7 +46,7 @@ namespace System.Runtime.InteropServices
                void BindToObject (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [In] ref Guid riidResult, [MarshalAs (UnmanagedType.Interface)] out object ppvResult);
                void BindToStorage (UCOMIBindCtx pbc, UCOMIMoniker pmkToLeft, [In] ref Guid riid, [MarshalAs (UnmanagedType.Interface)] out object ppvObj);
                void Reduce (UCOMIBindCtx pbc, int dwReduceHowFar, ref UCOMIMoniker ppmkToLeft, out UCOMIMoniker ppmkReduced);
-               void ComposeWith (UCOMIMoniker pmkRight, [MarshalAs (UnmanagedType.LPWStr)] bool fOnlyIfNotGeneric, out UCOMIMoniker ppmkComposite);
+               void ComposeWith (UCOMIMoniker pmkRight, [MarshalAs (UnmanagedType.Bool)] bool fOnlyIfNotGeneric, out UCOMIMoniker ppmkComposite);
                void Enum ([MarshalAs(UnmanagedType.Bool)] bool fForward, out UCOMIEnumMoniker ppenumMoniker);
                void IsEqual (UCOMIMoniker pmkOtherMoniker);
                void Hash (out int pdwHash);
@@ -63,3 +60,4 @@ namespace System.Runtime.InteropServices
                void IsSystemMoniker (out int pdwMksys);
        }
 }
+#endif