diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-22 16:10:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-07-23 06:46:41 +0200 |
| commit | ea20fcce1dac735a9730ab6672bf60ccec595e71 (patch) | |
| tree | df8f25ec6a90f47fb878236e239f8a23e679943c /package | |
| parent | a17b19726d723b16dacb49db7a8efd5fee9cb4cf (diff) | |
close some more holes in structures
and improve the pahole script so I can just run it once over the whole
codebase
Change-Id: I7e1775974a3a61f8c0e40646158f01163ace60cc
Reviewed-on: https://gerrit.libreoffice.org/76122
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/inc/ThreadedDeflater.hxx | 4 | ||||
| -rw-r--r-- | package/source/zipapi/ThreadedDeflater.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/inc/ThreadedDeflater.hxx b/package/inc/ThreadedDeflater.hxx index 7a86fbbd72ca..3bd7e4bc966a 100644 --- a/package/inc/ThreadedDeflater.hxx +++ b/package/inc/ThreadedDeflater.hxx @@ -38,11 +38,11 @@ class ThreadedDeflater final class Task; // Note: All this should be lock-less. Each task writes only to its part // of the data, flags are atomic. + std::vector<std::vector<sal_Int8>> outBuffers; + std::shared_ptr<comphelper::ThreadTaskTag> threadTaskTag; css::uno::Sequence<sal_Int8> inBuffer; int zlibLevel; - std::shared_ptr<comphelper::ThreadTaskTag> threadTaskTag; std::atomic<int> pendingTasksCount; - std::vector<std::vector<sal_Int8>> outBuffers; public: // Unlike with Deflater class, bNoWrap is always true. diff --git a/package/source/zipapi/ThreadedDeflater.cxx b/package/source/zipapi/ThreadedDeflater.cxx index f5fedee0273b..19bbda01bbb7 100644 --- a/package/source/zipapi/ThreadedDeflater.cxx +++ b/package/source/zipapi/ThreadedDeflater.cxx @@ -60,8 +60,8 @@ private: }; ThreadedDeflater::ThreadedDeflater(sal_Int32 nSetLevel) - : zlibLevel(nSetLevel) - , threadTaskTag(comphelper::ThreadPool::createThreadTaskTag()) + : threadTaskTag(comphelper::ThreadPool::createThreadTaskTag()) + , zlibLevel(nSetLevel) , pendingTasksCount(0) { } |