Skip to content

Conversation

@kleunen
Copy link
Contributor

@kleunen kleunen commented Oct 16, 2020

Renamed insert_or_update and update from multiple_subscription_map both to insert and return whether element was inserted or already exists

@redboltz
Copy link
Owner

Could you remove subscription_map.cpp update from the PR ?
And could you rebase the PR ?

I already renamed insert_or_update with insert.
See
13d5192

And
https://github.com/redboltz/mqtt_cpp/pull/688/files#diff-a35a6276aa5d36d9f80e25692e3bc78a7009bd82f326c9e54cc31c5661aedca9R158
should be remained as insert_or_update. It is for multi_index. It is actually done insert or update.

@redboltz
Copy link
Owner

Now, I'm checking CI issue on #687.

@redboltz redboltz force-pushed the sub_map_test branch 3 times, most recently from e4d0f0f to d2e512e Compare October 16, 2020 10:01
@redboltz
Copy link
Owner

It still CI processing but it seems that the problem has been fixed.
So it is ready for #688. Could you rebase #688 from sub_map_test ?

@kleunen
Copy link
Contributor Author

kleunen commented Oct 16, 2020

It is rebased now, but I have some more renames from insert_or_update to insert than you had. Also, i renamed the remove to erase, is that OK ?

@redboltz
Copy link
Owner

I will add comments in the code.

@kleunen
Copy link
Contributor Author

kleunen commented Oct 16, 2020

I will add comments in the code.

Also there was a problem in the CI, i fixed this now

@codecov
Copy link

codecov bot commented Oct 16, 2020

Codecov Report

Merging #688 into sub_map_test will not change coverage.
The diff coverage is n/a.

@@              Coverage Diff              @@
##           sub_map_test     #688   +/-   ##
=============================================
  Coverage         82.70%   82.70%           
=============================================
  Files                46       46           
  Lines              7082     7082           
=============================================
  Hits               5857     5857           
  Misses             1225     1225           

…th to insert and return whether element was inserted or already exists
…_map return the number of elements that were removed
@redboltz redboltz merged commit 2d50803 into redboltz:sub_map_test Oct 16, 2020
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