[Libreoffice-commits] .: Branch 'feature/vos-removal' - sal/inc

[Norbert Thiebaud]

 sal/inc/osl/mutex.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 98993475c2346a7135269730bcc0d404c02f0c30
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Wed Oct 20 06:26:34 2010 -0500

    rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity

diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 5f5bedc..70ca4dc 100644
--- a/sal/inc/osl/mutex.hxx
+++ b/sal/inc/osl/mutex.hxx
@@ -270,8 +270,8 @@ namespace osl
             SolarMutex() {}
             virtual ~SolarMutex() {}
     };
-    typedef osl::Guard< SolarMutex > SolarMutexGuard;
-    typedef osl::ClearableGuard< SolarMutex > ClearableSolarMutexGuard;
+    typedef osl::Guard< SolarMutex > SolarGuard;
+    typedef osl::ClearableGuard< SolarMutex > ClearableSolarGuard;
 }
 
 #endif  /* __cplusplus */