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

[class.mem, class.mfct.non-static] Convert nonstatic to non-static si… #658

Merged
merged 2 commits into from Mar 23, 2016

Conversation

AaronBallman
Copy link
Contributor

…nce the hyphenated use is the more common term.

\rSec2[class.mfct.non-static]{Nonstatic member functions}%
\indextext{member function!nonstatic}
\rSec2[class.mfct.non-static]{Non-static member functions}%
\indextext{member function!non-static}

\pnum
A \grammarterm{non-static} member function may be called for an object of
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the bogus \grammarterm while you're here?

@AaronBallman
Copy link
Contributor Author

I've removed the bogus grammar term. I didn't squash because they seem like unrelated changes, but I can try to squash if you would really like me to. :-P

@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 22, 2016

No, the two commits are fine now.

Does this change require regenerating the grammar and xrefs?

@AaronBallman
Copy link
Contributor Author

When I ran latexmk, it did say that it was generating a file for
grammarindex.idx, so I would imagine it does, but am not 100% certain (I'm
not overly familiar with latexmk).

On Tue, Mar 22, 2016 at 2:50 PM, Thomas Köppe notifications@github.com
wrote:

No, the two commits are fine now.

Does this change require regenerating the grammar and xrefs?


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
#658 (comment)

@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 22, 2016

There are "regenerate" guides in the Readme.

@AaronBallman
Copy link
Contributor Author

Thank you for the hint about regenerating from the readme, there were indeed modifications which I've added.

@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 22, 2016

The way makegram works depends on the particular flavour of sed on your system. For now, can you edit the grammar changes so that they only contain the relevant diff?

@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 22, 2016

Richard has fixed something, can you fetch and rebase? Then the makegram script should work better.

@AaronBallman
Copy link
Contributor Author

I fetched and rebased, which seems to have removed all the inserted whitespace from f586dad.

…nce the hyphenated use is the more common term.
@tkoeppe
Copy link
Contributor

tkoeppe commented Mar 23, 2016

My bad, the change doesn't affect the grammar at all, so no need to regenerate anything. As you were.

@jwakely jwakely merged commit 9f1b468 into cplusplus:master Mar 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants