Merged
Conversation
The comments in the code explain why we need this. Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
sloretz
approved these changes
Nov 17, 2020
sloretz
left a comment
There was a problem hiding this comment.
LGTM
subjectively I like #undef max more than an empty macro, but I don't have any non-subjective reasons for choosing one over the other.
Author
On balance, after looking at it more, I agree with you. I'm going to change to the other style and then run CI with that. |
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Author
sloretz
reviewed
Nov 18, 2020
Signed-off-by: Chris Lalancette <clalancette@openrobotics.org>
Author
sloretz
approved these changes
Nov 18, 2020
|
FYI @clalancette windows CI looks like a java traceback, twice. 3rd attempt in progress: |
Author
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
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.
The comments in the code explain why we need this.
Signed-off-by: Chris Lalancette clalancette@openrobotics.org
Some upcoming changes to pluginlib are going to cause us to
#include <windows.h>, which is why this is now needed to build on Windows.One other note: I believe that there is an alternative way to solve this, which is to use MSVC push_macro/pop_macro. That is, we'd do something like:
Both are kind of ugly, so I don't have a strong opinion one way or another.