Skip to content
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.

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

8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873 #190

Closed
wants to merge 4 commits into from
Closed

Conversation

apavlyutkin
Copy link
Contributor

@apavlyutkin apavlyutkin commented Nov 22, 2022

Hi!

Here is one more backport from MSVS2019 seria. This one fixes build failure in AWT due to C2039 and C2873. The patch from jdk-11 openjdk/jdk11u-dev@7166e13 is applied cleanly.

Verification MSVS2019 full build succedded
Regression: MSVS2017 / 2015 (requires --with-extra-cflags="/wd4005 /wd4091") / 2013 / 2012 / 2010 - ok


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/190/head:pull/190
$ git checkout pull/190

Update a local copy of the PR:
$ git checkout pull/190
$ git pull https://git.openjdk.org/jdk8u-dev pull/190/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 190

View PR using the GUI difftool:
$ git pr show -t 190

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/190.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 22, 2022

👋 Welcome back apavlyutkin! A progress list of the required criteria for merging this PR into pr/187 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title Backport 7166e13838a545b1e75307defc2cfa173dc38d20 8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873 Nov 22, 2022
@openjdk
Copy link

openjdk bot commented Nov 22, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 22, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 22, 2022

Webrevs

@phohensee
Copy link
Member

/clean

@openjdk openjdk bot added the clean label Nov 22, 2022
@openjdk
Copy link

openjdk bot commented Nov 22, 2022

@phohensee This backport pull request is now marked as clean

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/187 to master December 1, 2022 10:34
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8241087
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@apavlyutkin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8241087: Build failure with VS 2019 (16.5.0) due to C2039 and C2873

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 1, 2022
@apavlyutkin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@apavlyutkin
Your change (at version 60245ad) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Contributor

yan-too commented Dec 1, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

Going to push as commit 918a2ab.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 1, 2022
@openjdk openjdk bot closed this Dec 1, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 1, 2022
@openjdk
Copy link

openjdk bot commented Dec 1, 2022

@yan-too @apavlyutkin Pushed as commit 918a2ab.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
3 participants