From c606d330864a10caba6e0f9600db56ae445999c1 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 9 Nov 2021 18:50:02 +0200 Subject: osl::Mutex->std::mutex in TubeBuffer Change-Id: I3e2ef9f8b34cbc5befe8b19fa2d68dfd518090c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124929 Tested-by: Jenkins Reviewed-by: Noel Grandin --- drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'drawinglayer') diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx index 645958ae6a29..8065ad73e54f 100644 --- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx +++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx @@ -25,7 +25,7 @@ #include #include #include - +#include namespace drawinglayer::primitive3d { @@ -38,7 +38,7 @@ namespace drawinglayer::primitive3d Primitive3DContainer m_aLineTubeList; sal_uInt32 m_nLineTubeSegments; attribute::MaterialAttribute3D m_aLineMaterial; - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; public: TubeBuffer() : m_nLineTubeSegments(0) @@ -53,7 +53,7 @@ namespace drawinglayer::primitive3d const attribute::MaterialAttribute3D& rMaterial) { // may exclusively change cached data, use mutex - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); if (nSegments != m_nLineTubeSegments || !(rMaterial == m_aLineMaterial)) { @@ -120,7 +120,7 @@ namespace drawinglayer::primitive3d Primitive3DContainer m_aLineCapList; sal_uInt32 m_nLineCapSegments; attribute::MaterialAttribute3D m_aLineMaterial; - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; public: CapBuffer() : m_nLineCapSegments(0) @@ -134,7 +134,7 @@ namespace drawinglayer::primitive3d const attribute::MaterialAttribute3D& rMaterial) { // may exclusively change cached data, use mutex - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); if (nSegments != m_nLineCapSegments || !(rMaterial == m_aLineMaterial)) { @@ -195,7 +195,7 @@ namespace drawinglayer::primitive3d Primitive3DContainer m_aLineCapRoundList; sal_uInt32 m_nLineCapRoundSegments; attribute::MaterialAttribute3D m_aLineMaterial; - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; public: CapRoundBuffer() : m_nLineCapRoundSegments(0) @@ -209,7 +209,7 @@ namespace drawinglayer::primitive3d const attribute::MaterialAttribute3D& rMaterial) { // may exclusively change cached data, use mutex - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); if (nSegments != m_nLineCapRoundSegments || !(rMaterial == m_aLineMaterial)) { -- cgit