Cleanup, prepare for more C++ use.#1969
Merged
Merged
Conversation
This interacts badly with some C++ headers.
bd7c8c7 to
4c862db
Compare
|
✔️ 4c862db211726ff6a085562c4f6cc49202ecc59b -> Azure artifacts URL |
4c862db to
396c86c
Compare
Codecov Report
@@ Coverage Diff @@
## master #1969 +/- ##
=========================================
Coverage ? 46.49%
=========================================
Files ? 526
Lines ? 119259
Branches ? 0
=========================================
Hits ? 55445
Misses ? 63814
Partials ? 0
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
alexsavulescu
approved these changes
Aug 30, 2022
|
✔️ 396c86c31af39d078e43cb1aedf868d470a9f6a9 -> Azure artifacts URL |
Collaborator
Author
This interacts badly with some C++ headers.
This interacts badly with some C++ headers.
396c86c to
8940dcc
Compare
This interacts badly with some C++ headers, as type is a common name for a member type. Because _type is used in some ModelDB models, the path of least resistance is to rename type -> _type in the NEURON codebase.
8940dcc to
63e8da1
Compare
|
✔️ 63e8da1 -> Azure artifacts URL |
Collaborator
Author
|
✔️ 3721916 -> Azure artifacts URL |
Collaborator
Author
Collaborator
Author
Looks good to me. |
alexsavulescu
approved these changes
Sep 1, 2022
olupton
commented
Sep 1, 2022
olupton
left a comment
Collaborator
Author
There was a problem hiding this comment.
Just flagging the few "real" changes in this PR -- the rest is "just" directly applying the result of the previous macro magic.
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
3 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.
A few changes hoisted out of #1929 to help manage the size of that diff.
Having common names of C++ standard library functions/members (
begin,data, ...) and language keywords (delete, ...) defined as macros causes problems when more C++ headers are included. Rather than playing games with orders of includes and so on, just drop the macros and apply their old results directly to the code.