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.

Sign up for GitHub

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

Jump to bottom

Pick smallest available participant ID for new paricipants (backport #3437) #4555

Merged
merged 4 commits into from
Apr 4, 2024
Merged

Pick smallest available participant ID for new paricipants (backport #3437) #4555

merged 4 commits into from
Apr 4, 2024

Commits on Mar 13, 2024

  1. Pick smallest available participant ID for new paricipants (#3437) 

    * Pick smallest available participant ID for new paricipants

Signed-off-by: Shane Loretz <[email protected]>

* Fix style issues

Signed-off-by: Shane Loretz <[email protected]>

* Eliminate m_maxRTPSParticipantId

Signed-off-by: Shane Loretz <[email protected]>

* Clearer comments on rationale behind return value

Signed-off-by: Shane Loretz <[email protected]>

* static_cast to avoid warning on WIN32

Signed-off-by: Shane Loretz <[email protected]>

* Use special participant id value for prefix creation.

Signed-off-by: Miguel Company <[email protected]>

* New reservation mechanism

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Shane Loretz <[email protected]>
Signed-off-by: Miguel Company <[email protected]>
Co-authored-by: Miguel Company <[email protected]>
(cherry picked from commit e46e875)

# Conflicts:
#	src/cpp/rtps/RTPSDomain.cpp
#	src/cpp/rtps/RTPSDomainImpl.hpp
    @sloretz @mergify
    sloretz authored and mergify[bot] committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    edb4b45 View commit details
    Browse the repository at this point in the history

  2. Refs #20120: Solve conflicts 

    Signed-off-by: Jesus Perez <[email protected]>
    @jepemi
    jepemi committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    297de68 View commit details
    Browse the repository at this point in the history

  3. Refs #20120: Fix wrong deleted return 

    Signed-off-by: Jesus Perez <[email protected]>
    @jepemi
    jepemi committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    973fc7d View commit details
    Browse the repository at this point in the history

  4. Refs #20120: Uncrustify 

    Signed-off-by: Jesus Perez <[email protected]>
    @jepemi
    jepemi committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    ac46a63 View commit details
    Browse the repository at this point in the history