From dbfe0a9bc36dc81f287667559e2f73f0e8f034e8 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Mon, 25 Apr 2022 10:49:36 +0530
Subject: [PATCH 1/2] include: Move generic instantiations forward in windows.foundation.idl.

Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
---
 include/windows.foundation.idl | 42 +++++++++++++++-------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl
index c5f4c04..abd51ec 100644
--- a/include/windows.foundation.idl
+++ b/include/windows.foundation.idl
@@ -42,6 +42,25 @@ namespace Windows {
         typedef struct DateTime DateTime;
         typedef struct TimeSpan TimeSpan;
 
+        declare {
+            interface Windows.Foundation.Collections.IIterable<HSTRING>;
+            interface Windows.Foundation.Collections.IIterable<IInspectable *>;
+            interface Windows.Foundation.Collections.IIterator<HSTRING>;
+            interface Windows.Foundation.Collections.IIterator<IInspectable *>;
+            interface Windows.Foundation.Collections.IVectorView<HSTRING>;
+            interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
+            interface Windows.Foundation.Collections.IVector<HSTRING>;
+            interface Windows.Foundation.Collections.IVector<IInspectable *>;
+            interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>;
+            interface Windows.Foundation.EventHandler<IInspectable *>;
+            interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>;
+            interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
+            interface Windows.Foundation.IAsyncOperation<IInspectable *>;
+            interface Windows.Foundation.IAsyncOperation<boolean>;
+            interface Windows.Foundation.IReference<INT32>;
+            interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;
+        }
+
         [
             contract(Windows.Foundation.FoundationContract, 1.0),
             uuid(a4ed5c81-76c9-40bd-8be6-b1d90fb20ae7)
@@ -154,26 +173,3 @@ namespace Windows {
         }
     }
 }
-
-namespace Windows {
-    namespace Foundation {
-        declare {
-            interface Windows.Foundation.Collections.IIterable<HSTRING>;
-            interface Windows.Foundation.Collections.IIterable<IInspectable *>;
-            interface Windows.Foundation.Collections.IIterator<HSTRING>;
-            interface Windows.Foundation.Collections.IIterator<IInspectable *>;
-            interface Windows.Foundation.Collections.IVectorView<HSTRING>;
-            interface Windows.Foundation.Collections.IVectorView<IInspectable *>;
-            interface Windows.Foundation.Collections.IVector<HSTRING>;
-            interface Windows.Foundation.Collections.IVector<IInspectable *>;
-            interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>;
-            interface Windows.Foundation.EventHandler<IInspectable *>;
-            interface Windows.Foundation.AsyncOperationCompletedHandler<IInspectable *>;
-            interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>;
-            interface Windows.Foundation.IAsyncOperation<IInspectable *>;
-            interface Windows.Foundation.IAsyncOperation<boolean>;
-            interface Windows.Foundation.IReference<INT32>;
-            interface Windows.Foundation.TypedEventHandler<IInspectable *, IInspectable *>;
-        }
-    }
-}
-- 
2.35.3