diff options
author | David Tardon <dtardon@redhat.com> | 2016-02-12 14:04:52 +0100 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2016-02-12 14:05:37 +0100 |
commit | f1bb29ff34ef7a8adf3d4cdfba1108db6df87da2 (patch) | |
tree | c923a949892fea71e06592bcd03bc40e758f2725 /external/mdds | |
parent | 74b4e5ebbfd232e4d8862abfe9bd5ce777713da1 (diff) |
drop unused patch
Change-Id: Id81a7c5ace2a5ae0edfb61a1ebc82b84f1cbc527
Diffstat (limited to 'external/mdds')
-rw-r--r-- | external/mdds/mdds-c++98.patch.0 | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/external/mdds/mdds-c++98.patch.0 b/external/mdds/mdds-c++98.patch.0 deleted file mode 100644 index eaf1d60a86af..000000000000 --- a/external/mdds/mdds-c++98.patch.0 +++ /dev/null @@ -1,84 +0,0 @@ ---- include/mdds/multi_type_vector_itr.hpp -+++ include/mdds/multi_type_vector_itr.hpp -@@ -139,14 +139,15 @@ - typedef typename parent_type::size_type size_type; - typedef iterator_value_node<size_type, typename parent_type::element_block_type> node; - -- iterator_common_base() : m_cur_node(0, 0) {} -+ iterator_common_base() : m_cur_node(0, 0), m_singular(true) {} - - iterator_common_base( - const base_iterator_type& pos, const base_iterator_type& end, - size_type start_pos, size_type block_index) : - m_cur_node(start_pos, block_index), - m_pos(pos), -- m_end(end) -+ m_end(end), -+ m_singular(false) - { - if (m_pos != m_end) - update_node(); -@@ -154,9 +155,13 @@ - - iterator_common_base(const iterator_common_base& other) : - m_cur_node(other.m_cur_node), -- m_pos(other.m_pos), -- m_end(other.m_end) -+ m_singular(other.m_singular) - { -+ if (!m_singular) -+ { -+ m_pos = other.m_pos; -+ m_end = other.m_end; -+ } - } - - void update_node() -@@ -196,6 +201,7 @@ - node m_cur_node; - base_iterator_type m_pos; - base_iterator_type m_end; -+ bool m_singular; - - public: - bool operator== (const iterator_common_base& other) const -@@ -218,8 +224,12 @@ - iterator_common_base& operator= (const iterator_common_base& other) - { - m_cur_node = other.m_cur_node; -- m_pos = other.m_pos; -- m_end = other.m_end; -+ m_singular = other.m_singular; -+ if (!m_singular) -+ { -+ m_pos = other.m_pos; -+ m_end = other.m_end; -+ } - return *this; - } - -@@ -226,8 +236,22 @@ - void swap(iterator_common_base& other) - { - m_cur_node.swap(other.m_cur_node); -- std::swap(m_pos, other.m_pos); -- std::swap(m_end, other.m_end); -+ std::swap(m_singular, other.m_singular); -+ if (!(m_singular || other.m_singular)) -+ { -+ std::swap(m_pos, other.m_pos); -+ std::swap(m_end, other.m_end); -+ } -+ else if (!m_singular) -+ { -+ m_pos = other.m_pos; -+ m_end = other.m_end; -+ } -+ else if (!other.m_singular) -+ { -+ other.m_pos = m_pos; -+ other.m_end = m_end; -+ } - } - - const node& get_node() const { return m_cur_node; } |