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

[13312] Added PrintTo function for null_type (backport #2462) #2516

Merged
merged 2 commits into from
Feb 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 18, 2022

This is an automatic backport of pull request #2462 done by Mergify.
Cherry-pick of 53ac012 has failed:

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

You are currently cherry-picking commit 53ac0123a.
  (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:
	new file:   test/unittest/common/GTestPrinters.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/unittest/dds/participant/ParticipantTests.cpp

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

* Added workaround for GCC's incorrect GTest handling of null_types

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>

* Added GTest printer for dds::core::null_type

Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
(cherry picked from commit 53ac012)

# Conflicts:
#	test/unittest/dds/participant/ParticipantTests.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Feb 18, 2022
Signed-off-by: Javier Santiago <javiersantiago@eprosima.com>
@MiguelCompany MiguelCompany removed the conflicts Backport PR wich git cherry pick failed label Feb 23, 2022
@MiguelCompany MiguelCompany merged commit bcf89cf into 2.1.x Feb 23, 2022
@MiguelCompany MiguelCompany deleted the mergify/bp/2.1.x/pr-2462 branch February 23, 2022 17:17
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.

2 participants