| 1 |
scarabeus 12/08/02 09:05:35 |
| 2 |
|
| 3 |
Added: 0.6.0-right-overload-of-vector.patch |
| 4 |
0.6.0-multi-vector-build.patch |
| 5 |
Log: |
| 6 |
Another revision bump for bug#429348. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-util/mdds/files/0.6.0-right-overload-of-vector.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-right-overload-of-vector.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-right-overload-of-vector.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: 0.6.0-right-overload-of-vector.patch |
| 17 |
=================================================================== |
| 18 |
From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001 |
| 19 |
From: David Tardon <dtardon@××××××.com> |
| 20 |
Date: Fri, 20 Jul 2012 10:30:38 +0200 |
| 21 |
Subject: [PATCH] help compiler select the right overload of vector::insert |
| 22 |
|
| 23 |
--- |
| 24 |
include/mdds/multi_type_vector_def.inl | 8 ++++---- |
| 25 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 26 |
|
| 27 |
diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl |
| 28 |
index 252a260..fb72070 100644 |
| 29 |
--- a/include/mdds/multi_type_vector_def.inl |
| 30 |
+++ b/include/mdds/multi_type_vector_def.inl |
| 31 |
@@ -1148,7 +1148,7 @@ void multi_type_vector<_CellBlockFunc>::insert_empty_impl(size_type row, size_ty |
| 32 |
|
| 33 |
// Insert two new block below the current; one for the empty block being |
| 34 |
// inserted, and one for the lower part of the current non-empty block. |
| 35 |
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); |
| 36 |
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); |
| 37 |
|
| 38 |
m_blocks[block_index+1] = new block(length); |
| 39 |
m_blocks[block_index+2] = new block(size_blk_next); |
| 40 |
@@ -1302,7 +1302,7 @@ void multi_type_vector<_CellBlockFunc>::insert_cells_to_middle( |
| 41 |
// Insert two new blocks. |
| 42 |
size_type n1 = row - start_row; |
| 43 |
size_type n2 = blk->m_size - n1; |
| 44 |
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); |
| 45 |
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); |
| 46 |
blk->m_size = n1; |
| 47 |
|
| 48 |
m_blocks[block_index+1] = new block(length); |
| 49 |
@@ -1467,7 +1467,7 @@ void multi_type_vector<_CellBlockFunc>::set_cells_to_single_block( |
| 50 |
assert(start_row_in_block < start_row && end_row < end_row_in_block); |
| 51 |
|
| 52 |
// Insert two new blocks below the current one. |
| 53 |
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); |
| 54 |
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); |
| 55 |
|
| 56 |
// first new block is for the data array being inserted. |
| 57 |
size_type new_size = end_row - start_row + 1; |
| 58 |
@@ -1985,7 +1985,7 @@ void multi_type_vector<_CellBlockFunc>::set_empty_in_single_block( |
| 59 |
|
| 60 |
// First, insert two new blocks at position past the current block. |
| 61 |
size_type lower_block_size = end_row_in_block - end_row; |
| 62 |
- m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL); |
| 63 |
+ m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL); |
| 64 |
m_blocks[block_index+1] = new block(empty_block_size); // empty block. |
| 65 |
m_blocks[block_index+2] = new block(lower_block_size); |
| 66 |
|
| 67 |
-- |
| 68 |
1.7.11.2 |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
|
| 73 |
1.1 dev-util/mdds/files/0.6.0-multi-vector-build.patch |
| 74 |
|
| 75 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-multi-vector-build.patch?rev=1.1&view=markup |
| 76 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/mdds/files/0.6.0-multi-vector-build.patch?rev=1.1&content-type=text/plain |
| 77 |
|
| 78 |
Index: 0.6.0-multi-vector-build.patch |
| 79 |
=================================================================== |
| 80 |
From 770ff91820f8ed95f7ecc40b72b78ae57ee5d277 Mon Sep 17 00:00:00 2001 |
| 81 |
From: Kohei Yoshida <kohei.yoshida@×××××.com> |
| 82 |
Date: Thu, 19 Jul 2012 15:05:47 -0400 |
| 83 |
Subject: [PATCH] Fixes build breakage on Debian. |
| 84 |
|
| 85 |
--- |
| 86 |
include/mdds/multi_type_vector_types.hpp | 1 + |
| 87 |
1 file changed, 1 insertion(+) |
| 88 |
|
| 89 |
diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp |
| 90 |
index f27ac88..ac2b0ef 100644 |
| 91 |
--- a/include/mdds/multi_type_vector_types.hpp |
| 92 |
+++ b/include/mdds/multi_type_vector_types.hpp |
| 93 |
@@ -355,6 +355,7 @@ struct managed_element_block : public copyable_element_block<managed_element_blo |
| 94 |
typedef managed_element_block<_TypeId,_Data> self_type; |
| 95 |
|
| 96 |
using base_type::get; |
| 97 |
+ using base_type::set_value; |
| 98 |
using base_type::m_array; |
| 99 |
|
| 100 |
managed_element_block() : base_type() {} |
| 101 |
-- |
| 102 |
1.7.11.2 |
Archives