svn commit: r393925 - in head/devel/mdds: . files
Jung-uk Kim
jkim at FreeBSD.org
Mon Aug 10 23:39:27 UTC 2015
Author: jkim
Date: Mon Aug 10 23:39:24 2015
New Revision: 393925
URL: https://svnweb.freebsd.org/changeset/ports/393925
Log:
- Add several patches obtained from LibreOffice to make it more robust.
Now it works with old C++ headers on 9.x.
- Update project URL in pkg-descr.
MFH: 2015Q3
Added:
head/devel/mdds/files/
head/devel/mdds/files/patch-include_mdds_flat__segment__tree.hpp (contents, props changed)
head/devel/mdds/files/patch-include_mdds_flat__segment__tree__def.inl (contents, props changed)
head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__def.inl (contents, props changed)
head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl (contents, props changed)
head/devel/mdds/files/patch-include_mdds_multi__type__vector__itr.hpp (contents, props changed)
head/devel/mdds/files/patch-include_mdds_point__quad__tree.hpp (contents, props changed)
Modified:
head/devel/mdds/Makefile
head/devel/mdds/pkg-descr
Modified: head/devel/mdds/Makefile
==============================================================================
--- head/devel/mdds/Makefile Mon Aug 10 23:19:33 2015 (r393924)
+++ head/devel/mdds/Makefile Mon Aug 10 23:39:24 2015 (r393925)
@@ -2,6 +2,7 @@
PORTNAME= mdds
PORTVERSION= 0.12.1
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= http://kohei.us/files/mdds/src/
DISTNAME= ${PORTNAME}_${PORTVERSION}
Added: head/devel/mdds/files/patch-include_mdds_flat__segment__tree.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_flat__segment__tree.hpp Mon Aug 10 23:39:24 2015 (r393925)
@@ -0,0 +1,10 @@
+--- include/mdds/flat_segment_tree.hpp.orig 2015-06-11 23:53:55 UTC
++++ 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"
Added: head/devel/mdds/files/patch-include_mdds_flat__segment__tree__def.inl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_flat__segment__tree__def.inl Mon Aug 10 23:39:24 2015 (r393925)
@@ -0,0 +1,11 @@
+--- include/mdds/flat_segment_tree_def.inl.orig 2015-06-11 23:53:55 UTC
++++ include/mdds/flat_segment_tree_def.inl
+@@ -46,7 +46,7 @@ flat_segment_tree<_Key, _Value>::flat_se
+ // 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>
Added: head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__def.inl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__def.inl Mon Aug 10 23:39:24 2015 (r393925)
@@ -0,0 +1,13 @@
+--- include/mdds/mixed_type_matrix_def.inl.orig 2015-06-11 23:53:55 UTC
++++ include/mdds/mixed_type_matrix_def.inl
+@@ -220,8 +220,8 @@ void mixed_type_matrix<_String,_Flag>::a
+ // 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);
Added: head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl Mon Aug 10 23:39:24 2015 (r393925)
@@ -0,0 +1,24 @@
+--- include/mdds/mixed_type_matrix_storage_filled_linear.inl.orig 2015-06-11 23:53:55 UTC
++++ include/mdds/mixed_type_matrix_storage_filled_linear.inl
+@@ -354,8 +354,8 @@ public:
+ }
+
+ 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)
+@@ -614,8 +614,8 @@ public:
+ }
+
+ 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)
Added: head/devel/mdds/files/patch-include_mdds_multi__type__vector__itr.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_multi__type__vector__itr.hpp Mon Aug 10 23:39:24 2015 (r393925)
@@ -0,0 +1,83 @@
+--- include/mdds/multi_type_vector_itr.hpp.orig 2015-06-11 23:53:55 UTC
++++ include/mdds/multi_type_vector_itr.hpp
+@@ -139,14 +139,15 @@ protected:
+ typedef typename parent_type::size_type size_type;
+ typedef iterator_value_node<size_type, typename parent_type::element_block_type> node;
+
+- iterator_common_base() : m_cur_node(0, 0) {}
++ iterator_common_base() : m_cur_node(0, 0), m_singular(true) {}
+
+ iterator_common_base(
+ const base_iterator_type& pos, const base_iterator_type& end,
+ size_type start_pos, size_type block_index) :
+ m_cur_node(start_pos, block_index),
+ m_pos(pos),
+- m_end(end)
++ m_end(end),
++ m_singular(false)
+ {
+ if (m_pos != m_end)
+ update_node();
+@@ -154,9 +155,13 @@ protected:
+
+ iterator_common_base(const iterator_common_base& other) :
+ m_cur_node(other.m_cur_node),
+- m_pos(other.m_pos),
+- m_end(other.m_end)
++ m_singular(other.m_singular)
+ {
++ if (!m_singular)
++ {
++ m_pos = other.m_pos;
++ m_end = other.m_end;
++ }
+ }
+
+ void update_node()
+@@ -196,6 +201,7 @@ protected:
+ node m_cur_node;
+ base_iterator_type m_pos;
+ base_iterator_type m_end;
++ bool m_singular;
+
+ public:
+ bool operator== (const iterator_common_base& other) const
+@@ -218,16 +224,34 @@ public:
+ iterator_common_base& operator= (const iterator_common_base& other)
+ {
+ m_cur_node = other.m_cur_node;
+- m_pos = other.m_pos;
+- m_end = other.m_end;
++ m_singular = other.m_singular;
++ if (!m_singular)
++ {
++ m_pos = other.m_pos;
++ m_end = other.m_end;
++ }
+ return *this;
+ }
+
+ void swap(iterator_common_base& other)
+ {
+ m_cur_node.swap(other.m_cur_node);
+- std::swap(m_pos, other.m_pos);
+- std::swap(m_end, other.m_end);
++ std::swap(m_singular, other.m_singular);
++ if (!(m_singular || other.m_singular))
++ {
++ std::swap(m_pos, other.m_pos);
++ std::swap(m_end, other.m_end);
++ }
++ else if (!m_singular)
++ {
++ m_pos = other.m_pos;
++ m_end = other.m_end;
++ }
++ else if (!other.m_singular)
++ {
++ other.m_pos = m_pos;
++ other.m_end = m_end;
++ }
+ }
+
+ const node& get_node() const { return m_cur_node; }
Added: head/devel/mdds/files/patch-include_mdds_point__quad__tree.hpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/mdds/files/patch-include_mdds_point__quad__tree.hpp Mon Aug 10 23:39:24 2015 (r393925)
@@ -0,0 +1,17 @@
+--- include/mdds/point_quad_tree.hpp.orig 2015-06-11 23:53:55 UTC
++++ include/mdds/point_quad_tree.hpp
+@@ -635,10 +635,10 @@ point_quad_tree<_Key,_Data>::~point_quad
+ 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)
+ {
Modified: head/devel/mdds/pkg-descr
==============================================================================
--- head/devel/mdds/pkg-descr Mon Aug 10 23:19:33 2015 (r393924)
+++ head/devel/mdds/pkg-descr Mon Aug 10 23:39:24 2015 (r393925)
@@ -1,4 +1,4 @@
Multi-Dimensional Data Structure (mdds) is a collection of multi-dimensional
data structure and indexing algorithm.
-WWW: http://code.google.com/p/multidimalgorithm/
+WWW: https://gitlab.com/mdds/mdds
More information about the svn-ports-all
mailing list