Merge branch 'main' into bump-macos-12-14

microsoft · Oct 24, 2024 · fbf4c6a · fbf4c6a
2 parents c89e0d9 + 4166724
commit fbf4c6a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/include/public/mat.h b/lib/include/public/mat.h
@@ -370,7 +370,8 @@ extern "C" {
     {
 #ifdef _WIN32
         /* This code accepts a handle of a library loaded in customer's code */
-        evt_app_call_t impl = (evt_app_call_t)GetProcAddress((HMODULE)handle, "evt_api_call_default");
+        /* The intermediate (void*) cast prevents incompatible function type cast diagnostics */
+        evt_app_call_t impl = (evt_app_call_t)(void*)GetProcAddress((HMODULE)handle, "evt_api_call_default");
         if (impl != NULL)
         {
             evt_api_call = impl;

diff --git a/lib/modules b/lib/modules
diff --git a/tests/functests/MultipleLogManagersTests.cpp b/tests/functests/MultipleLogManagersTests.cpp
@@ -248,6 +248,7 @@ TEST_F(MultipleLogManagersTests, PrivacyGuardSharedWithTwoInstancesCoexist)
     MockLogger mockLogger;
     auto privacyConcernLogCount = 0;
     InitializationConfiguration config(&mockLogger, CommonDataContext {});
+    config.ScanForUrls = true;
     const auto privacyGuard = std::make_shared<PrivacyGuard>(config);
     mockLogger.m_logEventOverride = [&privacyConcernLogCount, &privacyGuard](const EventProperties& properties) {
         if (equalsIgnoreCase(properties.GetName(), privacyGuard->GetNotificationEventName()))