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
commita4c90068947f9a60e586ac38457238c33f33bef7 (patch)
treea94eac739289694605030cb3a4a50e597f41a423 /sal/inc/osl
parent6991ea8f40cac8887e3a350b984112d4147d83f2 (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 23418bfef3a6..4a2bd991a2ba 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 */