[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - sal/inc

[Norbert Thiebaud]

 sal/inc/osl/mutex.hxx |    1 +
 sal/inc/sal/cppunit.h |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit e30783d620a5f8505db37d71ea1fa547721d1e7e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 18:51:15 2011 -0600

    mis-merge we don't have pre/postextstl.h

diff --git a/sal/inc/sal/cppunit.h b/sal/inc/sal/cppunit.h
index cd6645b..d0b3e60 100644
--- a/sal/inc/sal/cppunit.h
+++ b/sal/inc/sal/cppunit.h
@@ -31,14 +31,12 @@
 
 #include <sal/types.h>
 
-#include "preextstl.h"
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 #undef CPPUNIT_PLUGIN_EXPORT
 #define CPPUNIT_PLUGIN_EXPORT extern "C" SAL_DLLPUBLIC_EXPORT
-#include "postextstl.h"
 
 #endif
 
commit 45f5ced361e80751b2a4d3dcf4a1b185a43e44f2
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Mar 12 18:50:32 2011 -0600

    add a ResettableSolarGuard type

diff --git a/sal/inc/osl/mutex.hxx b/sal/inc/osl/mutex.hxx
index 70ca4dc..d4c50b8 100644
--- a/sal/inc/osl/mutex.hxx
+++ b/sal/inc/osl/mutex.hxx
@@ -272,6 +272,7 @@ namespace osl
     };
     typedef osl::Guard< SolarMutex > SolarGuard;
     typedef osl::ClearableGuard< SolarMutex > ClearableSolarGuard;
+    typedef osl::ResettableGuard< SolarMutex > ResettableSolarGuard;
 }
 
 #endif  /* __cplusplus */