IReference operators need to go into the level-1 header (#906)

microsoft · Mar 29, 2021 · 5e1b063 · 5e1b063
1 parent 8684e14
commit 5e1b063
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 39 deletions.
diff --git a/cppwinrt/code_writers.h b/cppwinrt/code_writers.h
@@ -3248,19 +3248,12 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
             type);
     }
 
-    static void write_namespace_special(writer& w, std::string_view const& namespace_name, cache const& c)
+    static void write_namespace_special(writer& w, std::string_view const& namespace_name)
     {
         if (namespace_name == "Windows.Foundation")
         {
-            if (c.find("Windows.Foundation.PropertyValue"))
-            {
-                w.write(strings::base_reference_produce);
-            }
-            if (c.find("Windows.Foundation.Deferral"))
-            {
-                w.write(strings::base_deferral);
-            }
-
+            w.write(strings::base_reference_produce);
+            w.write(strings::base_deferral);
             w.write(strings::base_coroutine_foundation);
         }
         else if (namespace_name == "Windows.Foundation.Collections")
@@ -3292,4 +3285,12 @@ struct __declspec(empty_bases) produce_dispatch_to_overridable<T, D, %>
             w.write(strings::base_xaml_typename);
         }
     }
+
+    static void write_namespace_special_1(writer& w, std::string_view const& namespace_name)
+    {
+        if (namespace_name == "Windows.Foundation")
+        {
+            w.write(strings::base_reference_produce_1);
+        }
+    }
 }
diff --git a/cppwinrt/cppwinrt.vcxproj b/cppwinrt/cppwinrt.vcxproj
@@ -75,6 +75,7 @@
     <ClInclude Include="..\strings\base_meta.h" />
     <ClInclude Include="..\strings\base_natvis.h" />
     <ClInclude Include="..\strings\base_reference_produce.h" />
+    <ClInclude Include="..\strings\base_reference_produce_1.h" />
     <ClInclude Include="..\strings\base_security.h" />
     <ClInclude Include="..\strings\base_std_hash.h" />
     <ClInclude Include="..\strings\base_string.h" />

diff --git a/cppwinrt/cppwinrt.vcxproj.filters b/cppwinrt/cppwinrt.vcxproj.filters
@@ -115,6 +115,9 @@
     <ClInclude Include="..\strings\base_reference_produce.h">
       <Filter>strings</Filter>
     </ClInclude>
+    <ClInclude Include="..\strings\base_reference_produce_1.h">
+      <Filter>strings</Filter>
+    </ClInclude>
     <ClInclude Include="..\strings\base_security.h">
       <Filter>strings</Filter>
     </ClInclude>

diff --git a/cppwinrt/file_writers.h b/cppwinrt/file_writers.h
@@ -127,6 +127,7 @@ namespace cppwinrt
             auto wrap_type = wrap_type_namespace(w, ns);
             w.write_each<write_interface>(members.interfaces);
         }
+        write_namespace_special_1(w, ns);
 
         write_close_file_guard(w);
         w.swap();
@@ -201,7 +202,7 @@ namespace cppwinrt
             w.write_each<write_std_hash>(members.classes);
         }
 
-        write_namespace_special(w, ns, c);
+        write_namespace_special(w, ns);
 
         write_close_file_guard(w);
         w.swap();

diff --git a/strings/base_reference_produce.h b/strings/base_reference_produce.h
@@ -397,35 +397,7 @@ namespace winrt::impl
         static auto make(array_view<Windows::Foundation::Rect const> const& value) { return Windows::Foundation::PropertyValue::CreateRectArray(value); }
         using itf = Windows::Foundation::IReferenceArray<Windows::Foundation::Rect>;
     };
-}
-
-WINRT_EXPORT namespace winrt::Windows::Foundation
-{
-    template <typename T>
-    bool operator==(IReference<T> const& left, IReference<T> const& right)
-    {
-        if (get_abi(left) == get_abi(right))
-        {
-            return true;
-        }
-
-        if (!left || !right)
-        {
-            return false;
-        }
 
-        return left.Value() == right.Value();
-    }
-
-    template <typename T>
-    bool operator!=(IReference<T> const& left, IReference<T> const& right)
-    {
-        return !(left == right);
-    }
-}
-
-namespace winrt::impl
-{
     template <typename T, typename From>
     T unbox_value_type(From&& value)
     {

diff --git a/strings/base_reference_produce_1.h b/strings/base_reference_produce_1.h
@@ -0,0 +1,25 @@
+
+WINRT_EXPORT namespace winrt::Windows::Foundation
+{
+    template <typename T>
+    bool operator==(IReference<T> const& left, IReference<T> const& right)
+    {
+        if (get_abi(left) == get_abi(right))
+        {
+            return true;
+        }
+
+        if (!left || !right)
+        {
+            return false;
+        }
+
+        return left.Value() == right.Value();
+    }
+
+    template <typename T>
+    bool operator!=(IReference<T> const& left, IReference<T> const& right)
+    {
+        return !(left == right);
+    }
+}