summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-01-08 10:50:26 -0500
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-01-08 10:55:54 -0500
commit12890dd7adfc70bc562bb2760084515cc1269a38 (patch)
tree6d2640a42da9c78994e8bc3aa06243c64fb9626a
parent8389519a23470b104b28ad497eb61a66ba92b81e (diff)
Update mdds to 0.10.1, set it as the required baseline.
This update will obsolete two patches that were previously applied. Change-Id: I521e939905e473ca5d440dea3b03faeb9af4c0fb
-rw-r--r--configure.ac2
-rw-r--r--download.lst2
-rw-r--r--external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch54
-rw-r--r--external/mdds/0001-Workaround-for-an-old-gcc-bug.patch27
-rw-r--r--external/mdds/UnpackedTarball_mdds.mk2
5 files changed, 2 insertions, 85 deletions
diff --git a/configure.ac b/configure.ac
index 67efccebb07e..fcf8fd1f684b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8760,7 +8760,7 @@ AC_SUBST(SYSTEM_BOOST)
dnl ===================================================================
dnl Check for system mdds
dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.9.1])
+libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.10.1])
dnl ===================================================================
dnl Determine which hash container mdds shall use
diff --git a/download.lst b/download.lst
index e8ccd540131a..5049b0df38db 100644
--- a/download.lst
+++ b/download.lst
@@ -80,7 +80,7 @@ export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
-export MDDS_TARBALL := 26272a8e8c984d21ba800b4edcd3ada8-mdds_0.10.0.tar.bz2
+export MDDS_TARBALL := 01a380acfec23bf617117ce98e318f3d-mdds_0.10.1.tar.bz2
export MYSQLCPPCONN_TARBALL := 0981bda6548a8c8233ffce2b6e4b2a23-mysql-connector-c++-1.1.0.tar.gz
export MYTHES_TARBALL := 46e92b68e31e858512b680b3b61dc4c1-mythes-1.2.3.tar.gz
export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
diff --git a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch b/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
deleted file mode 100644
index c905cea5b286..000000000000
--- a/external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From d0a006ad2fcabd1e785787b9a5c84b32edbab780 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Tue, 7 Jan 2014 15:43:36 -0500
-Subject: [PATCH] Add a method to set empty to a span of elements.
-
----
- include/mdds/multi_type_matrix.hpp | 9 +++++++++
- include/mdds/multi_type_matrix_def.inl | 10 ++++++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/include/mdds/multi_type_matrix.hpp b/include/mdds/multi_type_matrix.hpp
-index a30393f..0574466 100644
---- a/include/mdds/multi_type_matrix.hpp
-+++ b/c/d/include/mdds/multi_type_matrix.hpp
-@@ -377,6 +377,15 @@ public:
- void set_empty(size_type row, size_type col);
-
- /**
-+ * Set specified range of elements empty.
-+ *
-+ * @param row row position of the first element.
-+ * @param col column position of the first element.
-+ * @param length length of the range to set empty.
-+ */
-+ void set_empty(size_type row, size_type col, size_type length);
-+
-+ /**
- * Set element referenced by the position object empty.
- *
- * @param pos position object that references element.
-diff --git a/include/mdds/multi_type_matrix_def.inl b/include/mdds/multi_type_matrix_def.inl
-index 21fe866..36f5448 100644
---- a/include/mdds/multi_type_matrix_def.inl
-+++ b/c/d/include/mdds/multi_type_matrix_def.inl
-@@ -240,6 +240,16 @@ void multi_type_matrix<_String>::set_empty(size_type row, size_type col)
- }
-
- template<typename _String>
-+void multi_type_matrix<_String>::set_empty(size_type row, size_type col, size_type length)
-+{
-+ if (length == 0)
-+ throw general_error("multi_type_matrix::set_empty: length of zero is not permitted.");
-+
-+ size_type pos1 = get_pos(row, col);
-+ m_store.set_empty(pos1, pos1+length-1);
-+}
-+
-+template<typename _String>
- typename multi_type_matrix<_String>::position_type
- multi_type_matrix<_String>::set_empty(const position_type& pos)
- {
---
-1.8.1.4
-
diff --git a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch b/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
deleted file mode 100644
index 8529fbfc2adf..000000000000
--- a/external/mdds/0001-Workaround-for-an-old-gcc-bug.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 3e3a5c483217fe05b5bd556bf1b2c6f3ec297cb1 Mon Sep 17 00:00:00 2001
-From: Kohei Yoshida <kohei.yoshida@gmail.com>
-Date: Sat, 22 Jun 2013 21:30:13 -0400
-Subject: [PATCH] Workaround for an old gcc bug.
-
-c.f. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=44963
----
- include/mdds/multi_type_vector_types.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/include/mdds/multi_type_vector_types.hpp b/include/mdds/multi_type_vector_types.hpp
-index c4b2772..44af655 100644
---- a/include/mdds/multi_type_vector_types.hpp
-+++ b/c/d/include/mdds/multi_type_vector_types.hpp
-@@ -278,7 +278,8 @@ public:
- #ifndef MDDS_MULTI_TYPE_VECTOR_USE_DEQUE
- d.reserve(d.size() + len);
- #endif
-- std::copy(its.first, its.second, std::back_inserter(d));
-+ for (; its.first != its.second; ++its.first)
-+ d.push_back(*its.first);
- }
-
- static void assign_values_from_block(
---
-1.8.1.4
-
diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk
index 6e9185b4887a..387b8bcfacf9 100644
--- a/external/mdds/UnpackedTarball_mdds.mk
+++ b/external/mdds/UnpackedTarball_mdds.mk
@@ -15,8 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3))
$(eval $(call gb_UnpackedTarball_add_patches,mdds,\
external/mdds/mdds_0.6.0.patch \
- external/mdds/0001-Workaround-for-an-old-gcc-bug.patch \
- external/mdds/0001-Add-a-method-to-set-empty-to-a-span-of-elements.patch \
))
# vim: set noet sw=4 ts=4: