From a7c3a2a9be83686657c06f37d521f9f6d2004ddd Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Fri, 9 Oct 2015 01:03:29 +0200 Subject: update to mdds 1.0 Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972 Reviewed-on: https://gerrit.libreoffice.org/20251 Tested-by: Jenkins Reviewed-by: Markus Mohrhard Tested-by: Markus Mohrhard --- external/libetonyek/ExternalProject_libetonyek.mk | 2 +- ...step-to-allow-fst-to-use-any-value-type.patch.1 | 55 ---------------------- external/mdds/UnpackedTarball_mdds.mk | 2 - external/mdds/mdds_0.6.0.patch | 54 --------------------- 4 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 delete mode 100644 external/mdds/mdds_0.6.0.patch (limited to 'external') diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index d296a1e817f1..c98889b2d116 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -40,7 +40,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --disable-werror \ --disable-weffc \ --without-tools \ - --with-mdds=0.x \ + --with-mdds=1.0 \ $(if $(filter WNT,$(OS_FOR_BUILD)),MKDIR_P="$(shell cygpath -m /usr/bin/mkdir) -p") \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ $(if $(filter LINUX,$(OS)), \ diff --git a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 b/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 deleted file mode 100644 index bed9c9cb750c..000000000000 --- a/external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 +++ /dev/null @@ -1,55 +0,0 @@ -From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Mon, 29 Jun 2015 14:28:42 +0200 -Subject: [PATCH] another step to allow fst to use any value type - -For some reason this is not a problem on modern compilers... ---- - include/mdds/flat_segment_tree.hpp | 1 - - include/mdds/flat_segment_tree_def.inl | 2 +- - src/flat_segment_tree_test.cpp | 4 ++++ - 3 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/include/mdds/flat_segment_tree.hpp b/include/mdds/flat_segment_tree.hpp -index b656bc3..02cf87e 100644 ---- a/include/mdds/flat_segment_tree.hpp -+++ b/include/mdds/flat_segment_tree.hpp -@@ -32,7 +32,6 @@ - #include - #include - #include --#include - - #include "mdds/node.hpp" - #include "mdds/flat_segment_tree_itr.hpp" -diff --git a/include/mdds/flat_segment_tree_def.inl b/include/mdds/flat_segment_tree_def.inl -index ebfee99..5fef1c3 100644 ---- a/include/mdds/flat_segment_tree_def.inl -+++ b/include/mdds/flat_segment_tree_def.inl -@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_segment_tree(key_type min_val, key_type ma - // We don't ever use the value of the right leaf node, but we need the - // value to be always the same, to make it easier to check for - // equality. -- m_right_leaf->value_leaf.value = ::std::numeric_limits::max(); -+ m_right_leaf->value_leaf.value = init_val; - } - - template -diff --git a/src/flat_segment_tree_test.cpp b/src/flat_segment_tree_test.cpp -index 81858f5..f7aead7 100644 ---- a/src/flat_segment_tree_test.cpp -+++ b/src/flat_segment_tree_test.cpp -@@ -1943,6 +1943,10 @@ void fst_test_non_numeric_value() - db.search(1, result); - - assert(result == "hello world"); -+ -+ db_type db2(db); -+ -+ assert(db == db2); - } - - void fst_test_non_numeric_key() --- -2.4.2 - diff --git a/external/mdds/UnpackedTarball_mdds.mk b/external/mdds/UnpackedTarball_mdds.mk index 504406bbb60a..26272572a0fc 100644 --- a/external/mdds/UnpackedTarball_mdds.mk +++ b/external/mdds/UnpackedTarball_mdds.mk @@ -14,9 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,mdds,$(MDDS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,mdds,3)) $(eval $(call gb_UnpackedTarball_add_patches,mdds,\ - external/mdds/mdds_0.6.0.patch \ external/mdds/mdds-c++98.patch.0 \ - external/mdds/0001-another-step-to-allow-fst-to-use-any-value-type.patch.1 \ )) # vim: set noet sw=4 ts=4: diff --git a/external/mdds/mdds_0.6.0.patch b/external/mdds/mdds_0.6.0.patch deleted file mode 100644 index fba150267329..000000000000 --- a/external/mdds/mdds_0.6.0.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-13 13:26:27.000000000 -0600 -+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_def.inl 2011-07-20 02:02:21.164198900 -0600 -@@ -216,8 +216,8 @@ - // assignment to self. - return; - -- size_t row_count = ::std::min(mp_storage->rows(), r.mp_storage->rows()); -- size_t col_count = ::std::min(mp_storage->cols(), r.mp_storage->cols()); -+ size_t row_count = (::std::min)(mp_storage->rows(), r.mp_storage->rows()); -+ size_t col_count = (::std::min)(mp_storage->cols(), r.mp_storage->cols()); - for (size_t i = 0; i < row_count; ++i) - for (size_t j = 0; j < col_count; ++j) - mp_storage->get_element(i, j) = r.mp_storage->get_element(i, j); ---- misc/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-13 13:26:27.000000000 -0600 -+++ misc/build/mdds_0.6.0/include/mdds/mixed_type_matrix_storage_filled_linear.inl 2011-07-20 02:02:21.179798900 -0600 -@@ -354,8 +354,8 @@ - } - - array_type new_array(new_size, &m_init_elem); -- size_t min_rows = ::std::min(row, m_rows); -- size_t min_cols = ::std::min(col, m_cols); -+ size_t min_rows = (::std::min)(row, m_rows); -+ size_t min_cols = (::std::min)(col, m_cols); - for (size_t i = 0; i < min_rows; ++i) - { - for (size_t j = 0; j < min_cols; ++j) -@@ -612,8 +612,8 @@ - } - - array_type new_array(new_size, element(0.0)); -- size_t min_rows = ::std::min(row, m_rows); -- size_t min_cols = ::std::min(col, m_cols); -+ size_t min_rows = (::std::min)(row, m_rows); -+ size_t min_cols = (::std::min)(col, m_cols); - for (size_t i = 0; i < min_rows; ++i) - { - for (size_t j = 0; j < min_cols; ++j) ---- misc/mdds_0.6.0/include/mdds/point_quad_tree.hpp 2011-07-13 13:26:27.000000000 -0600 -+++ misc/build/mdds_0.6.0/include/mdds/point_quad_tree.hpp 2011-07-20 02:04:36.088835900 -0600 -@@ -623,10 +623,10 @@ - template - void point_quad_tree<_Key,_Data>::insert(key_type x, key_type y, data_type data) - { -- m_xrange.first = ::std::min(m_xrange.first, x); -- m_xrange.second = ::std::max(m_xrange.second, x); -- m_yrange.first = ::std::min(m_yrange.first, y); -- m_yrange.second = ::std::max(m_yrange.second, y); -+ m_xrange.first = (::std::min)(m_xrange.first, x); -+ m_xrange.second = (::std::max)(m_xrange.second, x); -+ m_yrange.first = (::std::min)(m_yrange.first, y); -+ m_yrange.second = (::std::max)(m_yrange.second, y); - - if (!m_root) - { -- cgit