External/yaml-cpp
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make a missing node iterator .begin() == end()

Browse Source 
Instead of throwing an exception, just treat the iterator as if it had
zero positions
This commit is contained in:
Jonathan Hamilton 2015-05-28 20:23:38 -07:00
parent 0526d7c299
commit 12b1e7fa67
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/yaml-cpp/node/impl.h
View File

@ -282,26 +282,26 @@ inline std::size_t Node::size() const {
inline const_iterator Node::begin() const { inline const_iterator Node::begin() const {
if (!m_isValid) if (!m_isValid)
throw InvalidNode(); return const_iterator();
return m_pNode ? const_iterator(m_pNode->begin(), m_pMemory) return m_pNode ? const_iterator(m_pNode->begin(), m_pMemory)
: const_iterator(); : const_iterator();
} }
inline iterator Node::begin() { inline iterator Node::begin() {
if (!m_isValid) if (!m_isValid)
throw InvalidNode(); return iterator();
return m_pNode ? iterator(m_pNode->begin(), m_pMemory) : iterator(); return m_pNode ? iterator(m_pNode->begin(), m_pMemory) : iterator();
} }
inline const_iterator Node::end() const { inline const_iterator Node::end() const {
if (!m_isValid) if (!m_isValid)
throw InvalidNode(); return const_iterator();
return m_pNode ? const_iterator(m_pNode->end(), m_pMemory) : const_iterator(); return m_pNode ? const_iterator(m_pNode->end(), m_pMemory) : const_iterator();
} }
inline iterator Node::end() { inline iterator Node::end() {
if (!m_isValid) if (!m_isValid)
throw InvalidNode(); return iterator();
return m_pNode ? iterator(m_pNode->end(), m_pMemory) : iterator(); return m_pNode ? iterator(m_pNode->end(), m_pMemory) : iterator();
} }