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

Add different mode for malloc_size_of_is_0 macro dealing with generics #334

Merged
merged 5 commits into from
Feb 6, 2020
Merged

Add different mode for malloc_size_of_is_0 macro dealing with generics #334

merged 5 commits into from
Feb 6, 2020

Conversation

NikVolf
Copy link
Contributor

@NikVolf NikVolf commented Feb 6, 2020

No description provided.

@NikVolf NikVolf changed the title Add another mode for malloc_size_of_is_0 macro dealing with generics Add different mode for malloc_size_of_is_0 macro dealing with generics Feb 6, 2020
ordian
ordian approved these changes Feb 6, 2020
View reviewed changes
Copy link
Member

@ordian ordian left a comment

Choose a reason for hiding this comment

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

Sure, why not.

parity-util-mem/src/malloc_size.rs Show resolved Hide resolved
dvdplm
dvdplm approved these changes Feb 6, 2020
View reviewed changes
parity-util-mem/src/malloc_size.rs Show resolved Hide resolved
@NikVolf NikVolf merged commit 11ad766 into master Feb 6, 2020
@NikVolf NikVolf deleted the nv-upgrade-malloc-macro branch February 6, 2020 21:10
ordian added a commit that referenced this pull request Feb 7, 2020
@ordian
Merge branch 'master' into ao-no-overlay
7fb861a 
* master:
  Add different mode for malloc_size_of_is_0 macro dealing with generics (#334)
  [parity-crypto] Use upstream secp256k1 (#258)
  Bump parking_lot to 0.10 and minor versions (#332)
  Remove libc completely (#333)
  update changelogs (#329)
  bump parity-util-mem to 0.4.2 (#328)
  remove libc feature from fixed-hash (#317)
  kvdb-rocksdb: release 0.4.2 (#327)
  kvdb-rocksdb: fix iter_from_prefix being slow (#326)
  MallocSizeOf for BTreeSet (#325)
  split off primitives (#323)
  travis: disable kvdb-web tests for chrome (#324)
  Expand const fn coverage (#319)
  uint: make zero const fn (#318)
  README: fix appveyor badge (#316)
dvdplm added a commit that referenced this pull request Feb 8, 2020
@dvdplm
Merge branch 'master' into dp/chore/secp256k1-from-upstream
472a3e9 
* master:
  Add different mode for malloc_size_of_is_0 macro dealing with generics (#334)
  [parity-crypto] Use upstream secp256k1 (#258)
  Bump parking_lot to 0.10 and minor versions (#332)
  Remove libc completely (#333)
ordian added a commit that referenced this pull request Feb 11, 2020
@ordian
Merge remote-tracking branch 'origin/master' into ao-kvdb-sled
5d5f321 
* origin/master:
  [parity-crypto] prepare 0.5.0 (#336)
  [parity crypto]: remove unused depend `rustc_hex` (#337)
  Update doc comment (#335)
  Add different mode for malloc_size_of_is_0 macro dealing with generics (#334)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ordian ordian ordian approved these changes

@dvdplm dvdplm dvdplm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NikVolf @dvdplm @ordian