]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-99191: Use correct check for MSVC C++ version support in _wmimodule.cpp (GH-100381)
authorC.A.M. Gerlach <CAM.Gerlach@Gerlach.CAM>
Mon, 9 Jan 2023 17:48:24 +0000 (11:48 -0600)
committerGitHub <noreply@github.com>
Mon, 9 Jan 2023 17:48:24 +0000 (17:48 +0000)
Misc/NEWS.d/next/Windows/2022-12-20-18-36-17.gh-issue-99191.0cfRja.rst [new file with mode: 0644]
PC/_wmimodule.cpp

diff --git a/Misc/NEWS.d/next/Windows/2022-12-20-18-36-17.gh-issue-99191.0cfRja.rst b/Misc/NEWS.d/next/Windows/2022-12-20-18-36-17.gh-issue-99191.0cfRja.rst
new file mode 100644 (file)
index 0000000..57a95ab
--- /dev/null
@@ -0,0 +1,2 @@
+Use ``_MSVC_LANG >= 202002L`` instead of less-precise ``_MSC_VER >=1929``
+to more accurately test for C++20 support in :file:`PC/_wmimodule.cpp`.
index de22049dd33f34fa10403db1bf2b84d25aeb89bf..310aa86d94d9b6b07afa75b82efec5b4c155a870 100644 (file)
@@ -17,7 +17,7 @@
 #include <Python.h>
 
 
-#if _MSC_VER >= 1929
+#if _MSVC_LANG >= 202002L
 // We can use clinic directly when the C++ compiler supports C++20
 #include "clinic/_wmimodule.cpp.h"
 #else
@@ -96,9 +96,9 @@ _query_thread(LPVOID param)
     }
     if (SUCCEEDED(hr)) {
         hr = services->ExecQuery(
-            bstr_t("WQL"), 
+            bstr_t("WQL"),
             bstrQuery,
-            WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY, 
+            WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
             NULL,
             &enumerator
         );