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

[backport kinetic] rosconsole: don't use 0 as null pointer in macros #1730

Merged
merged 1 commit into from
Oct 3, 2019

Conversation

gavanderhoorn
Copy link
Contributor

As per subject.

Essentially ros/rosconsole#14.

PR as suggested in ros/rosconsole#14 (comment).

But use `NULL`, which will evaluate to `nullptr` on platforms where appropriate and `0` elsewhere.

Identical to ros/rosconsole#14.
@cwecht
Copy link
Contributor

cwecht commented Jun 19, 2019

why not nullptr? This will actually silence compiler warnings.

@gavanderhoorn
Copy link
Contributor Author

gavanderhoorn commented Jun 20, 2019

This is a straight copy of ros/rosconsole#14.

NULL is used as it will resolve to nullptr on platforms that support it. For other platforms it'll still be 0.

According to the author of ros/rosconsole#14.

@cwecht
Copy link
Contributor

cwecht commented Aug 10, 2019

Well, ok. Let's merge this!

@dirk-thomas dirk-thomas changed the base branch from kinetic-devel to melodic-devel August 12, 2019 20:59
@dirk-thomas
Copy link
Member

I changed the target branch to melodic-devel. Please update the patch to cleanly apply.

@gavanderhoorn
Copy link
Contributor Author

gavanderhoorn commented Aug 13, 2019

@dirk-thomas: I'm not sure I understand: I thought that ros/rosconsole serviced Melodic, and this repository was for Kinetic and older (at least for the logging infra).

That's why I asked about Kinetic and ros_comm in ros/rosconsole#14 (comment).

@gavanderhoorn
Copy link
Contributor Author

@dirk-thomas: 🛎️ ?

@dirk-thomas dirk-thomas changed the base branch from melodic-devel to kinetic-devel October 3, 2019 21:43
@dirk-thomas dirk-thomas changed the title rosconsole: don't use 0 as null pointer in macros [backport kinetic] rosconsole: don't use 0 as null pointer in macros Oct 3, 2019
@dirk-thomas
Copy link
Member

@ros-pull-request-builder retest this please

@dirk-thomas
Copy link
Member

Thanks for the patch.

(The Melodic CI results aren't valid anymore.)

@dirk-thomas dirk-thomas merged commit a4cd1fa into ros:kinetic-devel Oct 3, 2019
@gavanderhoorn gavanderhoorn deleted the patch-1 branch October 4, 2019 08:39
@gavanderhoorn
Copy link
Contributor Author

Thanks @dirk-thomas 👍

apologies for the confusion.

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.

3 participants