Updated mdds to 0.6.1.

Change-Id: Ibc0a67b689e5731afdfe2b9af7d991a998ffb389

5 files changed, 0 insertions, 122 deletions

diff --git a/mdds/0001-fix-linking-error-with-boost-1.50.patch b/mdds/0001-fix-linking-error-with-boost-1.50.patch
deleted file mode 100644
index 59367b52bffc..000000000000
--- a/mdds/0001-fix-linking-error-with-boost-1.50.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 09937e5d6b4b82efbff40da2aa50fb02f2250bb2 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Sat, 28 Jul 2012 14:32:47 +0200
-Subject: [PATCH] fix linking error with boost 1.50
-
----
- include/mdds/mixed_type_matrix_storage.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/mdds/mixed_type_matrix_storage.hpp b/include/mdds/mixed_type_matrix_storage.hpp
-index fa0bf25..bb4e354 100644
---- a/include/mdds/mixed_type_matrix_storage.hpp
-+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_storage.hpp
-@@ -32,6 +32,10 @@
- 
- #include <boost/ptr_container/ptr_vector.hpp>
- #include <boost/ptr_container/ptr_map.hpp>
-+// Boost.Pool indirectly pulls in Boost.System, causing linking error
-+// with Boost 1.50, because some (deprecated) symbols from System are
-+// not found.
-+#define BOOST_SYSTEM_NO_DEPRECATED
- #include <boost/pool/object_pool.hpp>
- 
- namespace mdds {
--- 
-1.7.11.2
-
diff --git a/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch b/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch
deleted file mode 100644
index fd43c1a09873..000000000000
--- a/mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 900cbea3ec067833b4284584f6dfa5502dc36de8 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Fri, 20 Jul 2012 10:30:38 +0200
-Subject: [PATCH] help compiler select the right overload of vector::insert
-
----
- include/mdds/multi_type_vector_def.inl |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl
-index 252a260..fb72070 100644
---- a/include/mdds/multi_type_vector_def.inl
-+++ misc/build/mdds_0.6.0/include/mdds/multi_type_vector_def.inl
-@@ -1148,7 +1148,7 @@ void multi_type_vector<_CellBlockFunc>::insert_empty_impl(size_type row, size_ty
- 
-     // Insert two new block below the current; one for the empty block being
-     // inserted, and one for the lower part of the current non-empty block.
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
- 
-     m_blocks[block_index+1] = new block(length);
-     m_blocks[block_index+2] = new block(size_blk_next);
-@@ -1302,7 +1302,7 @@ void multi_type_vector<_CellBlockFunc>::insert_cells_to_middle(
-     // Insert two new blocks.
-     size_type n1 = row - start_row;
-     size_type n2 = blk->m_size - n1;
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
-     blk->m_size = n1;
- 
-     m_blocks[block_index+1] = new block(length);
-@@ -1467,7 +1467,7 @@ void multi_type_vector<_CellBlockFunc>::set_cells_to_single_block(
-     assert(start_row_in_block < start_row && end_row < end_row_in_block);
- 
-     // Insert two new blocks below the current one.
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
- 
-     // first new block is for the data array being inserted.
-     size_type new_size = end_row - start_row + 1;
-@@ -1985,7 +1985,7 @@ void multi_type_vector<_CellBlockFunc>::set_empty_in_single_block(
- 
-     // First, insert two new blocks at position past the current block.
-     size_type lower_block_size = end_row_in_block - end_row;
--    m_blocks.insert(m_blocks.begin()+block_index+1, 2, NULL);
-+    m_blocks.insert(m_blocks.begin()+block_index+1, 2u, NULL);
-     m_blocks[block_index+1] = new block(empty_block_size); // empty block.
-     m_blocks[block_index+2] = new block(lower_block_size);
- 
--- 
-1.7.10.2
-
diff --git a/mdds/UnpackedTarball_mdds.mk b/mdds/UnpackedTarball_mdds.mk
index c837a52cde38..3394388111b1 100644
--- a/mdds/UnpackedTarball_mdds.mk
+++ b/mdds/UnpackedTarball_mdds.mk
@@ -13,10 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,mdds,\
 	mdds/mdds_0.6.0.patch \
-	mdds/0001-help-compiler-select-the-right-overload-of-vector-in.patch \
-	mdds/mdds_0.6.0-unused-parameter.patch \
-	mdds/mdds_0.6.0-unreachable-code.patch \
-	mdds/0001-fix-linking-error-with-boost-1.50.patch \
 	mdds/0001-Workaround-for-gcc-bug.patch \
 ))
 
diff --git a/mdds/mdds_0.6.0-unreachable-code.patch b/mdds/mdds_0.6.0-unreachable-code.patch
deleted file mode 100644
index 6a9d8331cd9f..000000000000
--- a/mdds/mdds_0.6.0-unreachable-code.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl	2012-07-23 16:20:34.101608964 +0200
-+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl	2012-07-23 16:19:13.022858991 +0200
-@@ -44,7 +44,6 @@
-         default:
-             throw matrix_error("unknown density type");
-     }
--    return NULL;
- }
- 
- template<typename _String, typename _Flag>
---- misc/mdds_0.6.0/include/mdds/multi_type_vector_trait.hpp	2012-07-19 05:09:49.000000000 +0200
-+++ misc/build/mdds_0.6.0/include/mdds/multi_type_vector_trait.hpp	2012-07-24 09:22:04.396955159 +0200
-@@ -95,7 +95,6 @@
-         default:
-             throw general_error("create_new_block: failed to create a new block of unknown type.");
-     }
--    return NULL;
- }
- 
- base_element_block* element_block_func_base::clone_block(const base_element_block& block)
-@@ -123,7 +122,6 @@
-         default:
-             throw general_error("clone_block: failed to clone a block of unknown type.");
-     }
--    return NULL;
- }
- 
- void element_block_func_base::delete_block(base_element_block* p)
diff --git a/mdds/mdds_0.6.0-unused-parameter.patch b/mdds/mdds_0.6.0-unused-parameter.patch
deleted file mode 100644
index 6abc69e2eac9..000000000000
--- a/mdds/mdds_0.6.0-unused-parameter.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/mdds_0.6.0/include/mdds/multi_type_vector_types.hpp	2012-07-19 05:09:49.000000000 +0200
-+++ misc/build/mdds_0.6.0/include/mdds/multi_type_vector_types.hpp	2012-07-23 09:31:51.636388620 +0200
-@@ -302,7 +302,7 @@
-     noncopyable_element_block(size_t n, const _Data& val) : base_type(n, val) {}
- 
- public:
--    static _Self* clone_block(const base_element_block& blk)
-+    static _Self* clone_block(const base_element_block&)
-     {
-         throw element_block_error("attempted to clone a noncopyable element block.");
-     }