summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:12:44 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:12:44 +0000
commit0a4f67bf53ce21a5cf63e983b0ded71329f79354 (patch)
tree291483d33a92a06df4ed622caa519db031b3a061
parent447aed0013183f22dedad978503b548f7619db39 (diff)
INTEGRATION: CWS warnings01 (1.11.122); FILE MERGED
2005/11/07 12:11:25 sb 1.11.122.3: #i53898# Made code warning-free (additional -W switches for GCC). 2005/09/23 00:35:06 sb 1.11.122.2: RESYNC: (1.11-1.12); FILE MERGED 2005/09/20 12:57:14 sb 1.11.122.1: #i53898# Globally disable problematic warnings.
-rw-r--r--sal/inc/osl/mutex.hxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 48e1beaf8..06adc8609 100644
--- a/sal/inc/osl/mutex.hxx
+++ b/sal/inc/osl/mutex.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: mutex.hxx,v $
*
- * $Revision: 1.12 $
+ * $Revision: 1.13 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 14:29:23 $
+ * last change: $Author: hr $ $Date: 2006-06-20 04:12:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -218,14 +218,18 @@ namespace osl
template< class T >
class ResettableGuard : public ClearableGuard< T >
{
+ private:
+ ResettableGuard(ResettableGuard &); // not defined
+ void operator =(ResettableGuard &); // not defined
+
protected:
T* pResetT;
public:
/** Acquires the object specified as parameter.
*/
- ResettableGuard( T* pT ) :
- ClearableGuard<T>( pT ),
- pResetT( pT )
+ ResettableGuard( T* pT_ ) :
+ ClearableGuard<T>( pT_ ),
+ pResetT( pT_ )
{}
/** Acquires the object specified as parameter.