Skip to content

src: remove duplicate env field from CryptoJob

Rodrigo Muino Tomonari requested to merge github/fork/bnoordhuis/fix31554 into master

Alternative take on #31554 that tightens up the use of env() getters.

First:

src: remove duplicate env field from CryptoJob

Add a `ThreadPoolWork::env()` getter and use that. To fix the diamond
problem in class CompressionStream that inherits from both AsyncWrap
and ThreadPoolWork, we add a `CompressionStream::env()` getter that
delegates to `AsyncWrap::env()`.

And then:

src: StreamBase::stream_env() -> StreamBase::env()

Rename `StreamBase::stream_env()` to `StreamBase::env()` and work around
the diamond problem by adding `env()` getters to several classes.

Merge request reports

Loading