diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-15 11:17:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-16 18:56:26 +0100 |
| commit | f53d9322b0ffefc4d3492ba9e8da3f5d8d96879c (patch) | |
| tree | 615c3004839bc56ee6d2ad522741d494631fbe8b /vcl | |
| parent | 065852f4eb5943074749ffb06c3d21e2f8931f98 (diff) | |
sal_uIntPtr->sal_uInt32 in yieldCounts
to match the underlying field in GenericSolarMutex
Change-Id: I98dcab3b684278c4a184534ba782b5b03b0504f0
Reviewed-on: https://gerrit.libreoffice.org/46508
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkinst.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk/gtkinst.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index 8ab1ba98a1e3..4b48a4b3762e 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -46,7 +46,7 @@ class GtkPrintWrapper; class GenPspGraphics; class GtkYieldMutex : public SalYieldMutex { - thread_local static std::stack<sal_uIntPtr> yieldCounts; + thread_local static std::stack<sal_uInt32> yieldCounts; public: GtkYieldMutex() {} diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 30f0aa51843f..4b840923a971 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -295,7 +295,7 @@ SalPrinter* GtkInstance::CreatePrinter( SalInfoPrinter* pInfoPrinter ) * for each pair, so we can accurately restore * it later. */ -thread_local std::stack<sal_uIntPtr> GtkYieldMutex::yieldCounts; +thread_local std::stack<sal_uInt32> GtkYieldMutex::yieldCounts; void GtkYieldMutex::ThreadsEnter() { |