Kaydet (Commit) bb7d5ce2 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

These patches are in the upstream.

Change-Id: Ie5dc6b93fbcd65d7763fb9232a984236fb7bd745
üst 878f4672
From e77d3ba18a2fd53488048b78264be011db5423f6 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Tue, 21 May 2013 15:38:51 -0400
Subject: [PATCH] Avoid crash when _GLIBCXX_DEBUG is defined.
I'm not sure why gcc's STL debug complains when swapping two iterators
when one of them is a singular, but doesn't when I assign one to the
other via assignment. But whichever works....
---
include/mdds/multi_type_vector_itr.hpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/include/mdds/multi_type_vector_itr.hpp b/include/mdds/multi_type_vector_itr.hpp
index a7954d2..7923a22 100644
--- a/b/include/mdds/multi_type_vector_itr.hpp
+++ u/r/screwed/include/mdds/multi_type_vector_itr.hpp
@@ -216,8 +216,9 @@ public:
iterator_common_base& operator= (const iterator_common_base& other)
{
- iterator_common_base assigned(other);
- swap(assigned);
+ m_cur_node = other.m_cur_node;
+ m_pos = other.m_pos;
+ m_end = other.m_end;
return *this;
}
--
1.8.0
...@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) ...@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \ mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-gcc-bug.patch \ mdds/0001-Workaround-for-gcc-bug.patch \
mdds/mdds_0.7.0_unreachable_warning.patch.1 \
mdds/0001-Avoid-crash-when-_GLIBCXX_DEBUG-is-defined.patch \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
diff -ru mdds.old/include/mdds/multi_type_vector_def.inl mdds/include/mdds/multi_type_vector_def.inl
--- mdds.old/include/mdds/multi_type_vector_def.inl 2013-03-12 21:18:16.340506918 +0100
+++ mdds/include/mdds/multi_type_vector_def.inl 2013-03-14 17:56:07.275475086 +0100
@@ -652,7 +652,9 @@
}
}
+#ifndef _MSC_VER // MSVC is too smart and warns about unreachable code
assert(!"this code path should never be reached!");
+#endif
}
// This empty block is right below a non-empty block.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment