summaryrefslogtreecommitdiff
path: root/sal/inc/osl
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-20 06:26:34 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 19:55:39 -0500
commita98d0d3fabddf6d1e511c5a8a5a649741c6c00ce (patch)
tree5ad4dec53639c0659a54fc3c3bb401d050f9a13f /sal/inc/osl
parentd290e1331c71a3d13db7b5b7e143c8c08f481660 (diff)
rename osl::SolarMutexGuard -> SolarGuard to avoid namespace ambiguity
Diffstat (limited to 'sal/inc/osl')
-rw-r--r--sal/inc/osl/mutex.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 5f5bedc25..70ca4dc22 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 */