diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-06 11:54:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-06 12:00:16 +0200 |
| commit | 6506af86b5e20a860c8d2d1dd578a22914df5f53 (patch) | |
| tree | 6bae0d9c5623937547dc12ed127bf5b19ca5fd87 /ucb/source | |
| parent | de7d2de928cda697b10a08d14fb958d0157217c6 (diff) | |
ucb: second try to fix weird STL assertion on tinderbox
It's possible that the constructor of RegexpMapIterImpl does not
initialize m_aIndex, so try to park m_aIndex on some end() iterator;
it looks like m_aIndex will not actually be used in this case, because
m_nList = -1.
Change-Id: I74cd0d1d87f3e90217c39bcd3168f157066ff3cb
Diffstat (limited to 'ucb/source')
| -rw-r--r-- | ucb/source/inc/regexpmap.tpt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ucb/source/inc/regexpmap.tpt b/ucb/source/inc/regexpmap.tpt index 0090029a8a6f..64abc37bf8fd 100644 --- a/ucb/source/inc/regexpmap.tpt +++ b/ucb/source/inc/regexpmap.tpt @@ -134,10 +134,11 @@ void RegexpMapIterImpl< Val >::setEntry() const //============================================================================ template< typename Val > RegexpMapIterImpl< Val >::RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap, - bool bBegin): - m_aEntry(rtl::OUString(), 0), - m_pMap(pTheMap), - m_bEntrySet(false) + bool bBegin) + : m_aEntry(rtl::OUString(), 0) + , m_aIndex(pTheMap->m_aList[Regexp::KIND_DOMAIN].end()) + , m_pMap(pTheMap) + , m_bEntrySet(false) { if (bBegin) { @@ -148,7 +149,6 @@ RegexpMapIterImpl< Val >::RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap, else { m_nList = Regexp::KIND_DOMAIN; - m_aIndex = m_pMap->m_aList[Regexp::KIND_DOMAIN].end(); } } |