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

Refs #9977. Add const to DataReader::guid() (backport #2590) #2607

Merged
merged 3 commits into from
Mar 28, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2022

This is an automatic backport of pull request #2590 done by Mergify.
Cherry-pick of e8581db has failed:

On branch mergify/bp/2.1.x/pr-2590
Your branch is up to date with 'origin/2.1.x'.

You are currently cherry-picking commit e8581dbe3.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/fastdds/subscriber/DataReader.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/dds/subscriber/DataReader.hpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Add const to DataReader::guid()

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Add non-const version of guid() method

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
(cherry picked from commit e8581db)

# Conflicts:
#	include/fastdds/dds/subscriber/DataReader.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Mar 25, 2022
@mergify mergify bot mentioned this pull request Mar 25, 2022
13 tasks
@MiguelCompany
Copy link
Member

@pablogs9 Would you mind solving conflicts here?

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
@pablogs9
Copy link
Member

Done! Thanks!

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
Copy link
Member

@MiguelCompany MiguelCompany left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks!

@MiguelCompany MiguelCompany merged commit d36ce3b into 2.1.x Mar 28, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2590 branch March 28, 2022 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants