summaryrefslogtreecommitdiff
path: root/mdds
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2013-05-20 18:23:10 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2013-05-20 20:20:39 -0400
commitfc3f0a25661e371f1f561ee21b8ba4c67a1a2173 (patch)
tree2f8f9aa97000ab2edf777023a99419c2b272e2ab /mdds
parent9785579ed0ec8e2e3e826c7e4cbbcaf51f8cb0d4 (diff)
We don't need this patch anymore.
Change-Id: Id6b787096d15c40903661fa3d309e8131b655752
Diffstat (limited to 'mdds')
-rw-r--r--mdds/0001-Remove-disambiguation-of-a-integer-type.patch25
-rw-r--r--mdds/UnpackedTarball_mdds.mk1
2 files changed, 0 insertions, 26 deletions
diff --git a/mdds/0001-Remove-disambiguation-of-a-integer-type.patch b/mdds/0001-Remove-disambiguation-of-a-integer-type.patch
deleted file mode 100644
index e23d057b6185..000000000000
--- a/mdds/0001-Remove-disambiguation-of-a-integer-type.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46cf3188790b821b359e13b14e2211898ab2139b Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Thu, 9 May 2013 14:48:41 -0400
-Subject: [PATCH] Remove disambiguation of a integer type.
-
----
- include/mdds/multi_type_vector_def.inl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
-index 2299a7b..f443e08 100644
---- a/include/mdds/multi_type_vector_def.inl
-+++ misc/build/mdds_0.8.0/include/mdds/multi_type_vector_def.inl
-@@ -1479,7 +1479,7 @@ multi_type_vector<_CellBlockFunc>::transfer_single_block(
-
- // Insert two new blocks below current.
- size_type blk2_size = blk_dest->m_size - dest_pos_in_block - len;
-- dest.m_blocks.insert(dest.m_blocks.begin()+dest_block_index+1, 2, NULL);
-+ dest.m_blocks.insert(dest.m_blocks.begin()+dest_block_index+1, 2u, NULL);
- dest.m_blocks[dest_block_index+1] = new block(len);
- dest.m_blocks[dest_block_index+2] = new block(blk2_size);
- blk_dest->m_size = dest_pos_in_block;
---
-1.8.0
-
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index 11a6a23d306c..b33bc1baee46 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
mdds/mdds_0.6.0.patch \
mdds/0001-Workaround-for-gcc-bug.patch \
mdds/mdds_0.7.0_unreachable_warning.patch.1 \
- mdds/0001-Remove-disambiguation-of-a-integer-type.patch \
))
# vim: set noet sw=4 ts=4: