[jdk13u-dev] RFR: 8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873

[Sergey Bylokhov]

Hi all,
This pull request contains a backport of commit [54564388](https://github.com/openjdk/jdk/commit/545643880c5bf00de850317b4b8c6f85074a2942) from the [openjdk/jdk](https://git.openjdk.java.net/jdk) repository.
The commit being backported was authored by Yasumasa Suenaga on 23 Mar 2020 and was reviewed by Sergey Bylokhov.

This change tweaks the code to support building using VS2019 which is already supported by the jdk11u.
I can confirm that the build failed before the fix and passed after, but it would be good if existing maintainers of 13u will confirm that the change did not break their environment.u.

Thanks!

-------------

Commit messages:
- Backport 545643880c5bf00de850317b4b8c6f85074a2942

Changes: https://git.openjdk.java.net/jdk13u-dev/pull/298/files
Webrev: https://webrevs.openjdk.java.net/?repo=jdk13u-dev&pr=298&range=00
Issue: https://bugs.openjdk.java.net/browse/JDK-8241087
Stats: 10 lines in 3 files changed: 2 ins; 5 del; 3 mod
Patch: https://git.openjdk.java.net/jdk13u-dev/pull/298.diff
Fetch: git fetch https://git.openjdk.java.net/jdk13u-dev pull/298/head:pull/298

PR: https://git.openjdk.java.net/jdk13u-dev/pull/298