diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2016-05-11 21:45:56 -0400 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-05-13 00:35:20 +0000 |
| commit | db729f3b685fd832a3ec7387b339cf2bbeb4bd4d (patch) | |
| tree | 035b7b9510f9bde6f069eae0add535626e2cc3dc /external | |
| parent | 0876e5a20ac9873dd111eb2a30a76488b642614f (diff) | |
Update mdds to 1.2.0. Note that the API version is also up.
liborcus-0.11.2 is out only to make it buildable with mdds-1.2.
Change-Id: I9648d827b008da252c57be0ebfd2efccb008ac70
Reviewed-on: https://gerrit.libreoffice.org/24944
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
Diffstat (limited to 'external')
| -rw-r--r-- | external/mdds/0001-Fix-some-build-snuffs.patch | 38 | ||||
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk | 1 |
2 files changed, 0 insertions, 39 deletions
diff --git a/external/mdds/0001-Fix-some-build-snuffs.patch b/external/mdds/0001-Fix-some-build-snuffs.patch deleted file mode 100644 index 5f32a9848041..000000000000 --- a/external/mdds/0001-Fix-some-build-snuffs.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cbd1fb07b96f48ec9ed3c3806a18dbd8a7fd5703 Mon Sep 17 00:00:00 2001 -From: Kohei Yoshida <kohei.yoshida@gmail.com> -Date: Thu, 11 Feb 2016 22:20:41 -0500 -Subject: [PATCH] Fix some build snuffs. - ---- - include/mdds/multi_type_vector_def.inl | 1 - - include/mdds/sorted_string_map_def.inl | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/include/mdds/multi_type_vector_def.inl b/include/mdds/multi_type_vector_def.inl -index a2d2fe0..549502b 100644 ---- include/mdds/multi_type_vector_def.inl -+++ include/mdds/multi_type_vector_def.inl -@@ -1936,7 +1936,6 @@ multi_type_vector<_CellBlockFunc, _EventFunc>::transfer_multi_blocks( - else - { - // Just move the whole block over. -- block* blk = m_blocks[block_index2]; - dest.m_blocks[dest_block_pos] = blk; - if (blk->mp_data) - { -diff --git a/include/mdds/sorted_string_map_def.inl b/include/mdds/sorted_string_map_def.inl -index 1983460..1509e30 100644 ---- include/mdds/sorted_string_map_def.inl -+++ include/mdds/sorted_string_map_def.inl -@@ -65,7 +65,7 @@ sorted_string_map<_ValueT>::sorted_string_map(const entry* entries, size_type en - m_entry_end(m_entries+m_entry_size) - { - #ifdef _GLIBCXX_DEBUG -- assert(std::is_sorted(m_entries, m_entry_end, compare<_ValueT>)); -+ assert(std::is_sorted(m_entries, m_entry_end, detail::compare<_ValueT>)); - #endif - } - --- -1.9.1 - diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index 2e4af6751e2c..c015f4c13f5a 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -14,7 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ - external/mdds/0001-Fix-some-build-snuffs.patch \ )) # vim: set noet sw=4 ts=4: |