diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2016-02-11 21:51:12 -0500 |
|---|---|---|
| committer | Kohei Yoshida <libreoffice@kohei.us> | 2016-02-12 04:29:27 +0000 |
| commit | 6cc5d37d87406671ac76e94a43f8a57f346caaaf (patch) | |
| tree | 05a0e5d649c64d86581ccf5ae92f23a4e307f9ef /external/mdds | |
| parent | 0ab6332f97ec8b12d96f43834febea21e0b39f6a (diff) | |
Update mdds to 1.1.0.
Change-Id: I89b9b2e562f5e934df25498f5587a339db23388f
Reviewed-on: https://gerrit.libreoffice.org/22304
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-Fix-some-build-snuffs.patch | 38 | ||||
| -rw-r--r-- | external/mdds/UnpackedTarball_mdds.mk | 4 |
2 files changed, 40 insertions, 2 deletions
diff --git a/external/mdds/0001-Fix-some-build-snuffs.patch b/external/mdds/0001-Fix-some-build-snuffs.patch new file mode 100644 index 000000000000..5f32a9848041 --- /dev/null +++ b/external/mdds/0001-Fix-some-build-snuffs.patch @@ -0,0 +1,38 @@ +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 26272572a0fc..2e4af6751e2c 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -11,10 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mdds)) $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,0)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ - external/mdds/mdds-c++98.patch.0 \ + external/mdds/0001-Fix-some-build-snuffs.patch \ )) # vim: set noet sw=4 ts=4: |