Skip to content

Moe Sync#3531

Merged
ronshapiro merged 3 commits into
masterfrom
sync-master-2019/07/15
Jul 16, 2019
Merged

Moe Sync#3531
ronshapiro merged 3 commits into
masterfrom
sync-master-2019/07/15

Conversation

@ronshapiro

Copy link
Copy Markdown
Contributor

This code has been reviewed and submitted internally. Feel free to discuss on the PR and we can submit follow-up changes as necessary.

Commits:

Clarify that SortedSetMultimap exposes the values for a key in sorted order but does *not* necessarily expose the keys in sorted order.

09bf107


Remove unneeded @SuppressWarnings from @benchmark methods.

RELNOTES=none

3c3f7c9


Rename a method to avoid J2ObjC collisions

Prevent J2ObjC from treating getAddSuppressed as a getter by renaming it generateAddSuppressed. This silences a -Wobjc-property-implementation warning; soon, such warnings will become errors. See the referenced bug for full context.

cc5a55e

cpovirk and others added 3 commits July 15, 2019 20:56
… order but does *not* necessarily expose the keys in sorted order.

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=257601507
RELNOTES=none

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=257615215
Prevent J2ObjC from treating `getAddSuppressed` as a getter by renaming it `generateAddSuppressed`. This silences a -Wobjc-property-implementation warning; soon, such warnings will become errors. See the referenced bug for full context.

RELNOTES=n/a

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=257616241
@ronshapiro ronshapiro added the internal-sync A PR that represents a push from Google's internal repo label Jul 16, 2019
@ronshapiro ronshapiro merged commit 278fffd into master Jul 16, 2019
@ronshapiro ronshapiro deleted the sync-master-2019/07/15 branch July 16, 2019 17:22
@jbduncan

jbduncan commented Jul 25, 2019

Copy link
Copy Markdown
Contributor

@ronshapiro The comment above looks like a very strange attempt at spam. Vote to remove it? :)

(If you agree, I'll remove this comment too to prevent confusion.)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: yes internal-sync A PR that represents a push from Google's internal repo

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants