Missed a couple types

Author: Stephen Hawley

SwiftRuntimeLibrary/SwiftAnyObject.cs

@@ -6,65 +6,22 @@
 using SwiftRuntimeLibrary.SwiftMarshal;
 
 namespace SwiftRuntimeLibrary {
-	public sealed class SwiftAnyObject : ISwiftObject {
+	public sealed class SwiftAnyObject : SwiftNativeObject {
 		SwiftAnyObject(IntPtr ptr)
-			: this (ptr, SwiftObjectRegistry.Registry)
+			: base (ptr, GetSwiftMetatype (), SwiftObjectRegistry.Registry)
 		{
 		}
 
-		SwiftAnyObject (IntPtr ptr, SwiftObjectRegistry registry)
-		{
-			SwiftObject = ptr;
-			SwiftCore.Retain (ptr);
-			registry.Add (this);
-		}
-
-		#region IDisposable implementation
-
-		bool disposed = false;
-		public void Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-
 		~SwiftAnyObject ()
 		{
 			Dispose (false);
 		}
 
-		void Dispose (bool disposing)
-		{
-			if (!disposed) {
-				if (disposing) {
-					DisposeManagedResources ();
-				}
-				DisposeUnmanagedResources ();
-				disposed = true;
-			}
-		}
-
-		void DisposeManagedResources ()
-		{
-		}
-
-		void DisposeUnmanagedResources ()
-		{
-			SwiftCore.Release (SwiftObject);
-		}
-		#endregion
-
-		#region ISwiftObject implementation
-
-		public IntPtr SwiftObject { get; set; }
-
 		public static SwiftAnyObject XamarinFactory (IntPtr p)
 		{
-			return new SwiftAnyObject (p, SwiftObjectRegistry.Registry);
+			return new SwiftAnyObject (p);
 		}
 
-		#endregion
-
 		public static SwiftAnyObject FromISwiftObject(ISwiftObject obj)
 		{
 			if (obj == null)

SwiftRuntimeLibrary/SwiftIteratorProtocol.cs

@@ -30,7 +30,7 @@ struct SwiftIteratorProtocolVtable {
 	}
 
 
-	public class SwiftIteratorProtocolProxy<T> : ISwiftObject, IIteratorProtocol<T> {
+	public class SwiftIteratorProtocolProxy<T> : SwiftNativeObject, IIteratorProtocol<T> {
 		static SwiftIteratorProtocolProxy ()
 		{
 			SetVTable ();
@@ -52,72 +52,29 @@ static void NextFuncReceiver (IntPtr returnVal, IntPtr self)
 
 		IIteratorProtocol<T> proxiedType;
 
+
 		public SwiftIteratorProtocolProxy (IIteratorProtocol<T> proxiedType)
+			: base (IteratorProtocolPinvokes.NewIteratorProtocol (StructMarshal.Marshaler.Metatypeof (typeof (T))),
+				  GetSwiftMetatype (), SwiftObjectRegistry.Registry)
 		{
 			this.proxiedType = proxiedType;
-			SwiftObject = IteratorProtocolPinvokes.NewIteratorProtocol (StructMarshal.Marshaler.Metatypeof (typeof (T)));
-			SwiftCore.Retain (SwiftObject);
-			SwiftObjectRegistry.Registry.Add (this);
-		}
-
-		SwiftIteratorProtocolProxy (IntPtr ptr)
-			: this (ptr, SwiftObjectRegistry.Registry)
-		{
 		}
 
 		SwiftIteratorProtocolProxy (IntPtr ptr, SwiftObjectRegistry registry)
+			: base (ptr, GetSwiftMetatype (), registry)
 		{
-			SwiftObject = ptr;
-			SwiftCore.Retain (ptr);
-			registry.Add (this);
-		}
-
-		#region IDisposable implementation
-
-		bool disposed = false;
-		public void Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
 		}
 
 		~SwiftIteratorProtocolProxy ()
 		{
 			Dispose (false);
 		}
 
-		void Dispose (bool disposing)
-		{
-			if (!disposed) {
-				if (disposing) {
-					DisposeManagedResources ();
-				}
-				DisposeUnmanagedResources ();
-				disposed = true;
-			}
-		}
-
-		void DisposeManagedResources ()
-		{
-		}
-
-		void DisposeUnmanagedResources ()
-		{
-			SwiftCore.Release (SwiftObject);
-		}
-		#endregion
-
-		#region ISwiftObject implementation
-
-		public IntPtr SwiftObject { get; set; }
-
 		public static SwiftIteratorProtocolProxy<T> XamarinFactory (IntPtr p)
 		{
 			return new SwiftIteratorProtocolProxy<T> (p, SwiftObjectRegistry.Registry);
 		}
 
-		#endregion
-
 		public static SwiftMetatype GetSwiftMetatype ()
 		{
 			return IteratorProtocolPinvokes.IteratorProtocolMetadataAccessor (SwiftMetadataRequest.Complete, StructMarshal.Marshaler.Metatypeof (typeof (T)));