Fix some breaks. Add missing build order dependency. Add inline keyword to fix linker duplication errors

dmachaj · dmachaj · commit ad6dace31933 · 2024-11-06T13:44:44.000-08:00
diff --git a/cppwinrt.sln b/cppwinrt.sln
@@ -109,6 +109,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3C7EA5F8-6
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_cpp20", "test\test_cpp20\test_cpp20.vcxproj", "{5FF6CD6C-515A-4D55-97B6-62AD9BCB77EA}"
 	ProjectSection(ProjectDependencies) = postProject
+		{559A7CF4-DC5F-4D62-BA6B-0C2B025593F8} = {559A7CF4-DC5F-4D62-BA6B-0C2B025593F8}
 		{A91B8BF3-28E4-4D9E-8DBA-64B70E4F0270} = {A91B8BF3-28E4-4D9E-8DBA-64B70E4F0270}
 		{D613FB39-5035-4043-91E2-BAB323908AF4} = {D613FB39-5035-4043-91E2-BAB323908AF4}
 	EndProjectSection
diff --git a/strings/base_activation.h b/strings/base_activation.h
@@ -53,7 +53,7 @@ namespace winrt::impl
     }
 
 #ifdef WINRT_REG_FREE
-    WINRT_IMPL_NOINLINE hresult reg_free_get_activation_factory(param::hstring const& name, bool isSameInterfaceAsIActivationFactory, winrt::guid const& guid, void** result) noexcept
+    WINRT_IMPL_NOINLINE inline hresult reg_free_get_activation_factory(param::hstring const& name, bool isSameInterfaceAsIActivationFactory, winrt::guid const& guid, void** result) noexcept
     {
         com_ptr<IErrorInfo> error_info;
         WINRT_IMPL_GetErrorInfo(0, error_info.put_void());

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ namespace winrt::impl`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`#ifdef WINRT_REG_FREE`
`56`		`- WINRT_IMPL_NOINLINE hresult reg_free_get_activation_factory(param::hstring const& name, bool isSameInterfaceAsIActivationFactory, winrt::guid const& guid, void** result) noexcept`
	`56`	`+ WINRT_IMPL_NOINLINE inline hresult reg_free_get_activation_factory(param::hstring const& name, bool isSameInterfaceAsIActivationFactory, winrt::guid const& guid, void** result) noexcept`
`57`	`57`	`{`
`58`	`58`	`com_ptr<IErrorInfo> error_info;`
`59`	`59`	`WINRT_IMPL_GetErrorInfo(0, error_info.put_void());`