diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:21:28 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2004-06-25 16:21:28 +0000 |
| commit | a0efb92a5e26da18773e2984df08360f54831aa1 (patch) | |
| tree | 3b53aecee34e176bedbb6771065ebdfabc1277c6 /vos/source | |
| parent | fd4dcfabad523ce8dce5708a92e24ab3055ed401 (diff) | |
INTEGRATION: CWS tune04 (1.9.114); FILE MERGED
2004/06/14 10:00:04 cmc 1.9.114.1: #i29636# turn global objects into local static data protected with swishy double-locked templated template
Diffstat (limited to 'vos/source')
| -rw-r--r-- | vos/source/process.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/vos/source/process.cxx b/vos/source/process.cxx index 86e5cd3596e4..1ac957de74b8 100644 --- a/vos/source/process.cxx +++ b/vos/source/process.cxx @@ -2,9 +2,9 @@ * * $RCSfile: process.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: obr $ $Date: 2001-06-08 13:56:16 $ + * last change: $Author: hjs $ $Date: 2004-06-25 17:21:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,6 +63,9 @@ #include <cstdarg> #include <vector> #include <rtl/ustring.hxx> +#ifndef INCLUDED_RTL_INSTANCE_HXX +#include <rtl/instance.hxx> +#endif #include "vos/process.hxx" #include "vos/diagnose.hxx" @@ -518,7 +521,11 @@ void OExtCommandLineImpl::init() // OExtCommandLine // -OMutex OExtCommandLine::aMutex; +namespace +{ + struct lclMutex : public rtl::Static< NAMESPACE_VOS(OMutex), lclMutex > {}; +} + OExtCommandLineImpl* OExtCommandLine::pExtImpl=0; @@ -529,7 +536,7 @@ VOS_IMPLEMENT_CLASSINFO( OExtCommandLine::OExtCommandLine() { - OGuard Guard(aMutex); + OGuard Guard(lclMutex::get()); if ( pExtImpl == NULL ) { |