From 4c93de2c921b43193985c057b03e329d6dddc5d4 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Wed, 20 Jun 2018 11:13:44 +0200
Subject: merge GenericSolarMutex and SolarMutex

Since nothing else is implementing the SolarMutex abstract class.

Change-Id: I2a41254af3e9c7534033cdd0bece9dd8e0258b9d
Reviewed-on: https://gerrit.libreoffice.org/56153
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 vcl/inc/osx/salinst.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vcl/inc/osx')

diff --git a/vcl/inc/osx/salinst.h b/vcl/inc/osx/salinst.h
index 13261df0d25a..8e15730a3843 100644
--- a/vcl/inc/osx/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -49,7 +49,7 @@ enum class SalEvent;
 
 typedef void(^RuninmainBlock)(void);
 
-class SalYieldMutex : public comphelper::GenericSolarMutex
+class SalYieldMutex : public comphelper::SolarMutex
 {
 public:
     OSX_RUNINMAIN_MEMBERS
-- 
cgit