diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-10-07 15:58:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-10-07 16:16:45 +0200 |
| commit | 45b876555073990a490bf2c9e174bce803f12eea (patch) | |
| tree | 86a2d1eec96503e654a33e14726c79e21e3238dc | |
| parent | ee3b34878a37dd83f5c924de6752a8d804958a41 (diff) | |
fix nullptr/boost compile error
error: no match for ternary ‘operator?:’ in
‘((writerfilter::dmapper::DomainMapper_Impl*)this)->writerfilter::dmapper::DomainMapper_Impl::m_aFieldStack.std::stack<_Tp,
_Sequence>::empty<boost::shared_ptr<writerfilter::dmapper::FieldContext>,
std::deque<boost::shared_ptr<writerfilter::dmapper::FieldContext>,
std::allocator<boost::shared_ptr<writerfilter::dmapper::FieldContext> > > >() ?
nullptr :
((writerfilter::dmapper::DomainMapper_Impl*)this)->writerfilter::dmapper::DomainMapper_Impl::m_aFieldStack.std::stack<_Tp,
_Sequence>::top<boost::shared_ptr<writerfilter::dmapper::FieldContext>,
std::deque<boost::shared_ptr<writerfilter::dmapper::FieldContext>,
std::allocator<boost::shared_ptr<writerfilter::dmapper::FieldContext> > > >()’
Change-Id: I76c7507390bcf80f6ca722c4eedfd65c9a46952f
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 1f98d0cc2553..b39686628527 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3361,7 +3361,9 @@ void DomainMapper_Impl::CloseFieldCommand() dmapper_logger->element("closeFieldCommand"); #endif - FieldContextPtr pContext = m_aFieldStack.empty() ? nullptr : m_aFieldStack.top(); + FieldContextPtr pContext; + if(!m_aFieldStack.empty()) + pContext = m_aFieldStack.top(); OSL_ENSURE( pContext.get(), "no field context available"); if( pContext.get() ) { |