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.

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

Jump to bottom

src: remove extra semi after member fn #38686

Closed
wants to merge 1 commit into from
Closed

src: remove extra semi after member fn #38686

wants to merge 1 commit into from

Conversation

codebytere
Copy link
Member

@codebytere codebytere commented May 14, 2021 •
edited
Loading

Added in #34186 and #38172 - causes build failures in Electron.

In file included from ../../third_party/electron_node/src/inspector_agent.cc:18:
../../third_party/electron_node/src/timer_wrap.h:35:23: error: extra ';' after member function definition [-Werror,-Wextra-semi]
  SET_NO_MEMORY_INFO();
                      ^
1 error generated.
[740/12750] CXX obj/cc/cc/layer_tree_host_impl.o

In file included from ../../third_party/electron_node/src/cares_wrap.cc:25:
../../third_party/electron_node/src/cares_wrap.h:144:37: error: extra ';' after member function definition [-Werror,-Wextra-semi]
  SET_MEMORY_INFO_NAME(NodeAresTask);
                                    ^
../../third_party/electron_node/src/cares_wrap.h:145:30: error: extra ';' after member function definition [-Werror,-Wextra-semi]
  SET_SELF_SIZE(NodeAresTask);
                             ^
2 errors generated.

@codebytere codebytere requested a review from jasnell May 14, 2021 11:58
@github-actions github-actions bot added c++ Issues and PRs that require attention from people who are familiar with C++. needs-ci PRs that need a full CI run. timers Issues and PRs related to the timers subsystem / setImmediate, setInterval, setTimeout. labels May 14, 2021
@codebytere codebytere force-pushed the remove-extra-semi branch from af935fe to d8e9367 Compare May 14, 2021 12:01
codebytere added a commit to electron/electron that referenced this pull request May 14, 2021
@codebytere
src: remove extra semis after member fns
23cab3e 
This was added in nodejs/node#34186 and
nodejs/node#38172.

Fix upstreamed at nodejs/node#38686.
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@RaisinTen RaisinTen added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label May 14, 2021
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/38098/

codebytere added a commit that referenced this pull request May 16, 2021
@codebytere
src: remove extra semi after member fn
82eddca 
PR-URL: #38686
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@codebytere
Copy link
Member Author

Landed in 82eddca

@codebytere codebytere closed this May 16, 2021
@codebytere codebytere deleted the remove-extra-semi branch May 16, 2021 12:42
targos pushed a commit that referenced this pull request May 17, 2021
@codebytere @targos
src: remove extra semi after member fn
6b409cf 
PR-URL: #38686
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@targos targos mentioned this pull request May 18, 2021
Merged
codebytere added a commit to electron/electron that referenced this pull request May 18, 2021
@codebytere
src: remove extra semis after member fns
092b512 
This was added in nodejs/node#34186 and
nodejs/node#38172.

Fix upstreamed at nodejs/node#38686.
codebytere added a commit to electron/electron that referenced this pull request May 20, 2021
@codebytere
src: remove extra semi after member fn
213ef3b 
nodejs/node#38686
@codebytere codebytere mentioned this pull request May 20, 2021
Closed
targos pushed a commit that referenced this pull request May 30, 2021
@codebytere @targos
src: remove extra semi after member fn
621df69 
PR-URL: #38686
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
codebytere added a commit to electron/electron that referenced this pull request May 31, 2021
@codebytere
src: remove extra semi after member fn
2c86720 
nodejs/node#38686
codebytere added a commit to electron/electron that referenced this pull request May 31, 2021
@codebytere
src: remove extra semi after member fn
f2d4e2d 
nodejs/node#38686
targos pushed a commit that referenced this pull request Jun 5, 2021
@codebytere @targos
src: remove extra semi after member fn
54229d9 
PR-URL: #38686
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
targos pushed a commit that referenced this pull request Jun 5, 2021
@codebytere @targos
src: remove extra semi after member fn
c6de1b7 
PR-URL: #38686
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@targos targos mentioned this pull request Jun 6, 2021
Merged
codebytere added a commit to electron/electron that referenced this pull request Jun 8, 2021
@codebytere
src: remove extra semi after member fn
8982ad2 
nodejs/node#38686
codebytere added a commit to electron/electron that referenced this pull request Jun 9, 2021
@codebytere
src: remove extra semi after member fn
6393671 
nodejs/node#38686
codebytere added a commit to electron/electron that referenced this pull request Jun 10, 2021
@codebytere
src: remove extra semi after member fn
16131de 
nodejs/node#38686
targos pushed a commit that referenced this pull request Jun 11, 2021
@codebytere @targos
src: remove extra semi after member fn
d66f88c 
PR-URL: #38686
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaisinTen RaisinTen RaisinTen approved these changes

@juanarbol juanarbol juanarbol approved these changes

@richardlau richardlau richardlau approved these changes

@cjihrig cjihrig cjihrig approved these changes

@Trott Trott Trott approved these changes

@jasnell jasnell jasnell approved these changes

Assignees
No one assigned
Labels
author ready PRs that have at least one approval, no pending requests for changes, and a CI started. c++ Issues and PRs that require attention from people who are familiar with C++. needs-ci PRs that need a full CI run. timers Issues and PRs related to the timers subsystem / setImmediate, setInterval, setTimeout.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@codebytere @nodejs-github-bot @jasnell @Trott @cjihrig @richardlau @juanarbol @RaisinTen