diff options
| author | Eike Rathke <erack@redhat.com> | 2014-01-07 15:47:43 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2014-01-08 18:45:32 +0000 |
| commit | e1023ab62a62bb76b73841c02e44eacaba699d0e (patch) | |
| tree | 053d77381865fca7d1d44cfea547f8e12febb3a9 /external/mdds | |
| parent | 9a8a7212508151971dde9811e71c1cb775585ac3 (diff) | |
resolved fdo#72929 buffer jump matrix' result matrix blocks
Update mdds to 0.10.1, set it as the required baseline.
Patch mdds to make available a method to empty multiple elements in one call.
This is for multi_type_matrix.
(cherry picked from commit 47a7565315dcfc4271c2b2c205225d914a1a5094)
Update mdds to 0.10.1, set it as the required baseline.
This update will obsolete two patches that were previously applied.
(cherry picked from commit 12890dd7adfc70bc562bb2760084515cc1269a38)
Conflicts:
download.lst
resolved fdo#72929 buffer jump matrix' result matrix blocks
(cherry picked from commit ae4dc8e0ea3b78d804d1022905501a56030073c0)
Change-Id: I7b1fcf6b16b5addbb76078506536542cddede25f
Reviewed-on: https://gerrit.libreoffice.org/7320
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Tested-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'external/mdds')
| -rw-r--r-- | external/mdds/0001-Workaround-for-an-old-gcc-bug.patch | 27 | ||||
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk | 1 |
2 files changed, 0 insertions, 28 deletions
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 1ccfc2a85f3d..387b8bcfacf9 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -15,7 +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 \ )) # vim: set noet sw=4 ts=4: |