[Libreoffice-commits] core.git: mdds/0001-Remove-disambiguation-of-a-integer-type.patch mdds/UnpackedTarball_mdds.mk

[Kohei Yoshida]

 mdds/0001-Remove-disambiguation-of-a-integer-type.patch |   25 ++++++++++++++++
 mdds/UnpackedTarball_mdds.mk                            |    1 
 2 files changed, 26 insertions(+)

New commits:
commit ab907dfb25fd8c1e145696dcd0180a6627aac072
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu May 9 14:57:16 2013 -0400

    Perhaps this will help the clang buildbot (?)
    
    Change-Id: Ib0b56e1c7d3b58de10a45ebc352f4f116cba58f9

diff --git a/mdds/0001-Remove-disambiguation-of-a-integer-type.patch b/mdds/0001-Remove-disambiguation-of-a-integer-type.patch
new file mode 100644
index 0000000..e23d057
--- /dev/null
+++ b/mdds/0001-Remove-disambiguation-of-a-integer-type.patch
@@ -0,0 +1,25 @@
+From 46cf3188790b821b359e13b14e2211898ab2139b Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida at 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 b33bc1b..11a6a23 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -17,6 +17,7 @@ $(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: