Inclusion order can break builds with SDK headers (#525)

kennykerr · web-flow · commit 57c56c1cc1d3 · 2020-02-12T06:39:18.000-08:00
diff --git a/strings/base_implements.h b/strings/base_implements.h
@@ -37,7 +37,7 @@ namespace winrt::impl
     template <template <typename> typename Condition, typename T>
     using tuple_if = typename tuple_if_base<Condition, T>::type;
 
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
 
     template <typename T>
     struct is_interface : std::disjunction<std::is_base_of<Windows::Foundation::IInspectable, T>, std::conjunction<std::is_base_of<::IUnknown, T>, std::negation<is_implements<T>>>> {};
@@ -469,7 +469,7 @@ namespace winrt::impl
         }
     };
 
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
 
     template <typename D, typename I>
     struct producer<D, I, std::enable_if_t<std::is_base_of_v< ::IUnknown, I> && !is_implements_v<I>>> : I
diff --git a/strings/base_macros.h b/strings/base_macros.h
@@ -44,3 +44,7 @@
 #undef _WINDOWS_NUMERICS_BEGIN_NAMESPACE_
 #undef _WINDOWS_NUMERICS_END_NAMESPACE_
 #endif
+
+#ifdef __IUnknown_INTERFACE_DEFINED__
+#define WINRT_IMPL_IUNKNOWN_DEFINED
+#endif
diff --git a/strings/base_meta.h b/strings/base_meta.h
@@ -118,7 +118,7 @@ namespace winrt::impl
     };
 
     template <typename T>
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
 #ifdef __clang__
     inline const guid guid_v{ __uuidof(T) };
 #else
diff --git a/strings/base_reference_produce.h b/strings/base_reference_produce.h
@@ -197,7 +197,7 @@ namespace winrt::impl
         static auto make(guid const& value) { return Windows::Foundation::PropertyValue::CreateGuid(value); }
     };
 
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
     template <>
     struct reference_traits<GUID>
     {
@@ -299,7 +299,7 @@ WINRT_EXPORT namespace winrt
                 return static_cast<T>(value.as<Windows::Foundation::IReference<std::underlying_type_t<T>>>().Value());
             }
         }
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
         else if constexpr (std::is_same_v<T, GUID>)
         {
             return value.as<Windows::Foundation::IReference<guid>>().Value();
@@ -349,7 +349,7 @@ WINRT_EXPORT namespace winrt
                     return static_cast<T>(temp.Value());
                 }
             }
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
             else if constexpr (std::is_same_v<T, GUID>)
             {
                 if (auto temp = value.try_as<Windows::Foundation::IReference<guid>>())
diff --git a/strings/base_types.h b/strings/base_types.h
@@ -59,7 +59,7 @@ WINRT_EXPORT namespace winrt
         {
         }
 
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
 
         constexpr guid(GUID const& value) noexcept :
             Data1(value.Data1),
@@ -112,7 +112,7 @@ WINRT_EXPORT namespace winrt::Windows::Foundation
 
 namespace winrt::impl
 {
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
     using hresult_type = long;
     using count_type = unsigned long;
     using guid_type = GUID;
diff --git a/strings/base_windows.h b/strings/base_windows.h
@@ -335,7 +335,7 @@ WINRT_EXPORT namespace winrt
         }
     }
 
-#ifdef __IUnknown_INTERFACE_DEFINED__
+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED
 
     inline ::IUnknown* get_unknown(Windows::Foundation::IUnknown const& object) noexcept
     {
diff --git a/test/test/guid_include.cpp b/test/test/guid_include.cpp
@@ -0,0 +1,3 @@
+#include "winrt/base.h"
+#include <Unknwn.h>
+#include "winrt/Windows.Foundation.h"
diff --git a/test/test/test.vcxproj b/test/test/test.vcxproj
@@ -363,6 +363,16 @@
     </ClCompile>
     <ClCompile Include="GetMany.cpp" />
     <ClCompile Include="get_activation_factory.cpp" />
+    <ClCompile Include="guid_include.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="hstring_empty.cpp" />
     <ClCompile Include="iid_ppv_args.cpp" />
     <ClCompile Include="inspectable_interop.cpp">

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ namespace winrt::impl`
`197`	`197`	`static auto make(guid const& value) { return Windows::Foundation::PropertyValue::CreateGuid(value); }`
`198`	`198`	`};`
`199`	`199`
`200`		`-#ifdef __IUnknown_INTERFACE_DEFINED__`
	`200`	`+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED`
`201`	`201`	`template <>`
`202`	`202`	`struct reference_traits<GUID>`
`203`	`203`	`{`
`@@ -299,7 +299,7 @@ WINRT_EXPORT namespace winrt`
`299`	`299`	`return static_cast<T>(value.as<Windows::Foundation::IReference<std::underlying_type_t<T>>>().Value());`
`300`	`300`	`}`
`301`	`301`	`}`
`302`		`-#ifdef __IUnknown_INTERFACE_DEFINED__`
	`302`	`+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED`
`303`	`303`	`else if constexpr (std::is_same_v<T, GUID>)`
`304`	`304`	`{`
`305`	`305`	`return value.as<Windows::Foundation::IReference<guid>>().Value();`
`@@ -349,7 +349,7 @@ WINRT_EXPORT namespace winrt`
`349`	`349`	`return static_cast<T>(temp.Value());`
`350`	`350`	`}`
`351`	`351`	`}`
`352`		`-#ifdef __IUnknown_INTERFACE_DEFINED__`
	`352`	`+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED`
`353`	`353`	`else if constexpr (std::is_same_v<T, GUID>)`
`354`	`354`	`{`
`355`	`355`	`if (auto temp = value.try_as<Windows::Foundation::IReference<guid>>())`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ WINRT_EXPORT namespace winrt`
`59`	`59`	`{`
`60`	`60`	`}`
`61`	`61`
`62`		`-#ifdef __IUnknown_INTERFACE_DEFINED__`
	`62`	`+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED`
`63`	`63`
`64`	`64`	`constexpr guid(GUID const& value) noexcept :`
`65`	`65`	`Data1(value.Data1),`
`@@ -112,7 +112,7 @@ WINRT_EXPORT namespace winrt::Windows::Foundation`
`112`	`112`
`113`	`113`	`namespace winrt::impl`
`114`	`114`	`{`
`115`		`-#ifdef __IUnknown_INTERFACE_DEFINED__`
	`115`	`+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED`
`116`	`116`	`using hresult_type = long;`
`117`	`117`	`using count_type = unsigned long;`
`118`	`118`	`using guid_type = GUID;`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ WINRT_EXPORT namespace winrt`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`
`338`		`-#ifdef __IUnknown_INTERFACE_DEFINED__`
	`338`	`+#ifdef WINRT_IMPL_IUNKNOWN_DEFINED`
`339`	`339`
`340`	`340`	`inline ::IUnknown* get_unknown(Windows::Foundation::IUnknown const& object) noexcept`
`341`	`341`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#include "winrt/base.h"`
	`2`	`+#include <Unknwn.h>`
	`3`	`+#include "winrt/Windows.Foundation.h"`