diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:29:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:29:01 +0000 |
| commit | df352e8c89678f165a6131f739b1ef39a74a580a (patch) | |
| tree | eceeb7806fe47fe14830188e23503a338dd7f0c3 /sal | |
| parent | bbee848881b94f74a6daf45bfb3bffdadf0bbc59 (diff) | |
INTEGRATION: CWS warnings01 (1.33.12); FILE MERGED
2006/06/09 13:52:01 sb 1.33.12.3: #i53898# Fixed previous fix.
2005/09/23 01:27:37 sb 1.33.12.2: RESYNC: (1.33-1.34); FILE MERGED
2005/08/29 13:56:03 sb 1.33.12.1: #i53898# Made code warning-free.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/bootstrap.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sal/rtl/source/bootstrap.cxx b/sal/rtl/source/bootstrap.cxx index a69684a06a42..b1c1fc2a9d90 100644 --- a/sal/rtl/source/bootstrap.cxx +++ b/sal/rtl/source/bootstrap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: bootstrap.cxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: rt $ $Date: 2005-09-08 16:00:14 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:29:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -320,8 +320,8 @@ struct Bootstrap_Impl Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) : _nRefCount( 0 ), - _iniName (rIniName), - _base_ini( 0 ) + _base_ini( 0 ), + _iniName (rIniName) { OUString base_ini( getIniFileName_Impl() ); // normalize path @@ -624,7 +624,9 @@ void SAL_CALL rtl_bootstrap_args_close ( if (r_bootstrap_map.size() > nLeaking) { ::std::size_t erased = r_bootstrap_map.erase( that->_iniName ); - OSL_ASSERT( erased == 1 ); + if (erased != 1) { + OSL_ASSERT( false ); + } delete that; } } |