Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixes #11

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

Merged
merged 16 commits into from
Jul 4, 2016
Merged

Fixes #11

merged 16 commits into from
Jul 4, 2016

Conversation

tkruse
Copy link
Contributor

@tkruse tkruse commented May 12, 2016

Hi @theandrewdavis, this is somewhat embarassing, I had forgotten that you took cpplint maintenance over, and over the last few weeks I continued working on my cpplint fork.
I merged several PRs that people did on the original google styleguide repo, and made some fixes of my own. Some discussion here: tkruse/cpplint#19
No harm done, I guess, I'll just make PRs against your repo.

This PR are the things I had already merged into my fork, I can split them up into smaller PRs if you feel unsure about some of the commits.

tkruse and others added 9 commits May 13, 2016 07:52
# Conflicts:
#	cpplint.pyx
There are occasions where you would like to copy documentation from an
overloaded function on a single doxygen comment line:

/// @copydoc Func(const int lot, const int of, const int parameters, const int that, const int go, const int over, const int line, const int length)

This shouldn't be a line length error as doxygen doesn't parse the
command correctly if you split it over two lines
There are occasions where you would like to copy documentation from an
overloaded function on a single doxygen comment line:

/// @copydoc Func(const int lot, const int of, const int parameters, const int that, const int go, const int over, const int line, const int length)

This shouldn't be a line length error as doxygen doesn't parse the
command correctly if you split it over two lines
@theandrewdavis theandrewdavis merged commit 84e384f into cpplint:master Jul 4, 2016
@tkruse tkruse deleted the fixes branch July 4, 2016 21:06
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.

4 participants