Change None in C/C++ source to NoneType.#545
Merged
jbeder merged 2 commits intojbeder:masterfrom Nov 29, 2017
Merged
Conversation
Prevent name conflict with X11 None definition.
jbeder
requested changes
Nov 28, 2017
| GTEST_DECLARE_string_(filter); | ||
|
|
||
| // This flag causes the Google Test to list tests. None of the tests listed | ||
| // This flag causes the Google Test to list tests. NoneType of the tests listed |
Owner
There was a problem hiding this comment.
Revert this; and all of the ones in gtest.
NoneType -> None
Contributor
Author
|
Reverted changes to gtest files. |
jbeder
approved these changes
Nov 29, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For issue #320
Prevent name conflict with X11 None definition.
Passes all tests, simple update using the following commands:
find -type f -and ( -iname '.c' -or -iname '.h' ) -and -not -iname '*.cbproj' -and -exec sh -c 'egrep -n "None[^A-Za-z0-9]+" {}' ; -and -print -and -exec echo ; -exec sed -i.backup -re 's:([^A-Za-z0-9]+)(None)([^A-Za-z0-9]+):\1\2Type\3:g' {} ;
Confirmed to no longer conflict with X11.