diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 13:15:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-18 13:15:39 +0000 |
| commit | 82b4727a414bc8b6840efd335c522a5c3750864b (patch) | |
| tree | f2ac12891a15919e9282c5053d16119fba000efc /bridges | |
| parent | 6d737f18b12618df0f29427c81b715633e52eef8 (diff) | |
INTEGRATION: CWS pj71 (1.5.30); FILE MERGED
2007/01/15 10:27:28 pjanik 1.5.30.1: #i70648#: Prevent warnigns on Mac OS X/PPC.
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx index d87e644e7..60c99d5e3 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_powerpc/except.cxx @@ -4,9 +4,9 @@ * * $RCSfile: except.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 15:52:02 $ + * last change: $Author: vg $ $Date: 2007-01-18 14:15:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -170,8 +170,8 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR else { // try to lookup the symbol in the generated rtti map - t_rtti_map::const_iterator iFind( m_generatedRttis.find( unoName ) ); - if (iFind == m_generatedRttis.end()) + t_rtti_map::const_iterator iiFind( m_generatedRttis.find( unoName ) ); + if (iiFind == m_generatedRttis.end()) { // we must generate it ! // symbol and rtti-name is nearly identical, @@ -200,7 +200,7 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR } else // taking already generated rtti { - rtti = iFind->second; + rtti = iiFind->second; } } } |