Skip to content

gh-99191: Use correct check for MSVC C++ version support in _wmimodule.cpp #100381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 2 commits into from
Jan 9, 2023
Merged

gh-99191: Use correct check for MSVC C++ version support in _wmimodule.cpp #100381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
472ef32
Use correct check for MSVC C++ version support in _wmimodule.cpp
CAM-Gerlach Dec 20, 2022
6b33a99
Add NEWS entry for MSVC C++20 check change
CAM-Gerlach Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Windows/2022-12-20-18-36-17.gh-issue-99191.0cfRja.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`.
6 changes: 3 additions & 3 deletions PC/_wmimodule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
);
Expand Down