Skip to content

Remove unused headers#190

Merged
clalancette merged 1 commit intoros2:masterfrom
christophebedard:deprecate-rcutils-get-env-header
May 4, 2021
Merged

Remove unused headers#190
clalancette merged 1 commit intoros2:masterfrom
christophebedard:deprecate-rcutils-get-env-header

Conversation

@christophebedard
Copy link
Copy Markdown
Member

@christophebedard christophebedard commented Apr 30, 2021

ros2/rcutils#340 deprecates rcutils/get_env.h. This PR doesn't need to wait until the rcutils PR is merged, though.

I simply removed the #include since nothing from that header was actually used.

Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
#include <memory>

#include "rcutils/env.h"
#include "rcutils/get_env.h"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, we can't do this here because rcutils_get_env is used below (at least, we can't do this prior to ros2/rcutils#340 being merged). So either this has to remain part of the larger series to move rcutils_get_env into env.h, or we have to switch the test code to use rcpputils::get_env. Either is fine with me.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rcutils/env.h includes rcutils/get_env.h, though: https://github.com/ros2/rcutils/blob/ca42bc9f588e11ad40f5879dcb9a364b435d2cba/include/rcutils/env.h#L31

Ah! I totally missed that. Thanks for the heads up. I'll approve and run CI on this, then.

@clalancette
Copy link
Copy Markdown
Contributor

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@clalancette clalancette merged commit 52aae84 into ros2:master May 4, 2021
@christophebedard christophebedard deleted the deprecate-rcutils-get-env-header branch May 4, 2021 14:32
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