update to mdds 1.0
Change-Id: I5b6e928ab5a5f2bf84d50f3f0221c0585670d972 Reviewed-on: https://gerrit.libreoffice.org/20251 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
This commit is contained in:
Markus Mohrhard
@@ -8759,7 +8759,7 @@ AC_SUBST(SYSTEM_BOOST)
|
||||
dnl ===================================================================
|
||||
dnl Check for system mdds
|
||||
dnl ===================================================================
|
||||
libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds >= 0.12.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
|
||||
libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.0 >= 1.0.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Check for system glm
|
||||
|
||||
@@ -93,8 +93,8 @@ export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.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 := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
|
||||
export MDDS_MD5SUM := ef2560ed5416652a7fe195305b14cebe
|
||||
export MDDS_TARBALL := mdds_0.12.1.tar.bz2
|
||||
export MDDS_MD5SUM := 74e0a81c5af4137285fe6a52217f71e4
|
||||
export MDDS_TARBALL := mdds_1.0.0.tar.bz2
|
||||
export MSPUB_MD5SUM := ff9d0f9dd8fbc523408ea1953d5bde41
|
||||
export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2
|
||||
export MWAW_MD5SUM := 4a8a53a9d997cf0e2bd208178797dbfb
|
||||
|
||||
@@ -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)), \
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
From 5fc9214fb94595e1a2c0b9e0285037f5a2fa59bf Mon Sep 17 00:00:00 2001
|
||||
From: David Tardon <dtardon@redhat.com>
|
||||
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 <sstream>
|
||||
#include <utility>
|
||||
#include <cassert>
|
||||
-#include <limits>
|
||||
|
||||
#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<value_type>::max();
|
||||
+ m_right_leaf->value_leaf.value = init_val;
|
||||
}
|
||||
|
||||
template<typename _Key, typename _Value>
|
||||
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
|
||||
|
||||
2
external/mdds/UnpackedTarball_mdds.mk
vendored
2
external/mdds/UnpackedTarball_mdds.mk
vendored
@@ -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:
|
||||
|
||||
54
external/mdds/mdds_0.6.0.patch
vendored
54
external/mdds/mdds_0.6.0.patch
vendored
@@ -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<typename _Key, typename _Data>
|
||||
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)
|
||||
{
|
||||
Reference in New Issue
Block a user