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

Remove obsolete patches.

Change-Id: Icf50e577b4ad472faa00a85e8ecc309bf2d953d0
üst 45759608
From a2a1c432f65c0612bb6f1c23a50bd41d2cf0cbdd Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Tue, 25 Jun 2013 08:08:09 -0400
Subject: [PATCH] Combine these two calls. There is no reason why they have to
separate.
---
include/mdds/multi_type_vector_def.inl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
index 36dde5e..685899b 100644
--- a/include/mdds/multi_type_vector_def.inl
+++ b/c/d/include/mdds/multi_type_vector_def.inl
@@ -1801,8 +1801,7 @@ void multi_type_vector<_CellBlockFunc>::swap_single_blocks(
else
{
// Insert a new block to store the new elements.
- m_blocks.insert(m_blocks.begin()+block_index, NULL);
- m_blocks[block_index] = new block(len);
+ m_blocks.insert(m_blocks.begin()+block_index, new block(len));
block* blk = m_blocks[block_index];
blk->mp_data = dst_data.release();
}
--
1.8.0
From e9fdebe0cad9277cfed994cae7fe9d08efbb4ba8 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@gmail.com>
Date: Tue, 25 Jun 2013 09:42:19 -0400
Subject: [PATCH] Fix it here too.
---
include/mdds/multi_type_vector_def.inl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
index 685899b..cea8ae0 100644
--- a/include/mdds/multi_type_vector_def.inl
+++ b/c/d/include/mdds/multi_type_vector_def.inl
@@ -1829,8 +1829,7 @@ void multi_type_vector<_CellBlockFunc>::swap_single_blocks(
}
else
{
- m_blocks.insert(m_blocks.begin()+block_index+1, NULL);
- m_blocks[block_index+1] = new block(len);
+ m_blocks.insert(m_blocks.begin()+block_index+1, new block(len));
block* blk = m_blocks[block_index+1];
blk->mp_data = dst_data.release();
}
@@ -2713,8 +2713,7 @@
else
{
// Insert a new block to store the new elements.
- m_blocks.insert(m_blocks.begin()+dst_index+1, NULL);
- m_blocks[dst_index+1] = new block(len);
+ m_blocks.insert(m_blocks.begin()+dst_index+1, new block(len));
blk = m_blocks[dst_index+1];
blk->mp_data = element_block_func::create_new_block(cat_src, 0);
assert(blk->mp_data);
--
1.8.0
......@@ -16,8 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-an-old-gcc-bug.patch \
mdds/0001-Combine-these-two-calls.-There-is-no-reason-why-they.patch \
mdds/0001-Fix-it-here-too.patch \
))
# vim: set noet sw=4 ts=4:
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