Update mdds to 1.0, based on the wip version by coypu and leot.

mdds 1.0.0

* all

  * introduced API versioning to ease parallel installation of API
    incompatible versions.  Version 1.0.0 will have an API versoin of
    1.0.

  * C++11 is now a hard requirement.

  * added API documentation via Doxygen, Sphinx and Breathe.

* mixed_type_matrix

  * officially removed for good in favor of multi_type_matrix.

* multi_type_vector

  * added memory usage reduction by conditionally shrinking the
    capacity of the underlying vector containers.

  * added slight performance gain by revising block adjustment policy
    during splitting of blocks.

* sorted_string_map

  * fixed a bug where a non-matching key was incorrectly returned as a
    matching key.

11 files changed, 44 insertions, 265 deletions

diff --git a/devel/mdds/Makefile b/devel/mdds/Makefile
index dd927543a2c..0b182ec55b7 100644
--- a/devel/mdds/Makefile
+++ b/devel/mdds/Makefile
@@ -1,40 +1,21 @@
-# $NetBSD: Makefile,v 1.28 2015/08/12 00:45:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.29 2016/02/13 08:40:22 wiz Exp $
 
-DISTNAME=	mdds_0.12.1
+DISTNAME=	mdds_1.0.0
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	devel
 MASTER_SITES=	http://kohei.us/files/mdds/src/
 EXTRACT_SUFX=	.tar.bz2
-EXTRACT_USING=	gtar
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/multidimalgorithm/
+HOMEPAGE=	https://gitlab.com/mdds/mdds
 COMMENT=	Collection of multi-dimensional data structure and indexing algorithms
 LICENSE=	mit
 
-USE_LANGUAGES=		c++
 GNU_CONFIGURE=		yes
-#NO_BUILD=		yes
-INSTALLATION_DIRS=	include/mdds/compat include/mdds/hash_container \
-			share/pkgconfig
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
 PKGCONFIG_OVERRIDE+=	misc/mdds.pc.in
 
-do-install:
-	for i in ${WRKSRC}/include/mdds/*.hpp; do \
-		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \
-	done
-	for i in ${WRKSRC}/include/mdds/*.inl; do \
-		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds; \
-	done
-	for i in ${WRKSRC}/include/mdds/compat/*.hpp; do \
-		${INSTALL_DATA} $$i ${DESTDIR}${PREFIX}/include/mdds/compat; \
-	done
-	for i in ${WRKSRC}/include/mdds/hash_container/*.hpp; do \
-		${INSTALL_DATA} $$i \
-			${DESTDIR}${PREFIX}/include/mdds/hash_container; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/misc/mdds.pc ${DESTDIR}${PREFIX}/share/pkgconfig
-
 BUILDLINK_DEPMETHOD.boost-headers?=	build
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
diff --git a/devel/mdds/PLIST b/devel/mdds/PLIST
index f5713eb9a34..e87ed215dff 100644
--- a/devel/mdds/PLIST
+++ b/devel/mdds/PLIST
@@ -1,36 +1,32 @@
-@comment $NetBSD: PLIST,v 1.8 2015/08/12 00:45:18 ryoon Exp $
-include/mdds/compat/unique_ptr.hpp
-include/mdds/default_deleter.hpp
-include/mdds/flat_segment_tree.hpp
-include/mdds/flat_segment_tree_def.inl
-include/mdds/flat_segment_tree_itr.hpp
-include/mdds/global.hpp
-include/mdds/hash_container/map.hpp
-include/mdds/mixed_type_matrix.hpp
-include/mdds/mixed_type_matrix_def.inl
-include/mdds/mixed_type_matrix_element.hpp
-include/mdds/mixed_type_matrix_flag_storage.hpp
-include/mdds/mixed_type_matrix_storage.hpp
-include/mdds/mixed_type_matrix_storage_filled_linear.inl
-include/mdds/mixed_type_matrix_storage_sparse.inl
-include/mdds/multi_type_matrix.hpp
-include/mdds/multi_type_matrix_def.inl
-include/mdds/multi_type_vector.hpp
-include/mdds/multi_type_vector_custom_func1.hpp
-include/mdds/multi_type_vector_custom_func2.hpp
-include/mdds/multi_type_vector_custom_func3.hpp
-include/mdds/multi_type_vector_def.inl
-include/mdds/multi_type_vector_itr.hpp
-include/mdds/multi_type_vector_macro.hpp
-include/mdds/multi_type_vector_trait.hpp
-include/mdds/multi_type_vector_types.hpp
-include/mdds/node.hpp
-include/mdds/point_quad_tree.hpp
-include/mdds/quad_node.hpp
-include/mdds/rectangle_set.hpp
-include/mdds/rectangle_set_def.inl
-include/mdds/segment_tree.hpp
-include/mdds/segment_tree_def.inl
-include/mdds/sorted_string_map.hpp
-include/mdds/sorted_string_map_def.inl
-share/pkgconfig/mdds.pc
+@comment $NetBSD: PLIST,v 1.9 2016/02/13 08:40:22 wiz Exp $
+include/mdds-1.0/mdds/default_deleter.hpp
+include/mdds-1.0/mdds/flat_segment_tree.hpp
+include/mdds-1.0/mdds/flat_segment_tree_def.inl
+include/mdds-1.0/mdds/flat_segment_tree_itr.hpp
+include/mdds-1.0/mdds/global.hpp
+include/mdds-1.0/mdds/multi_type_matrix.hpp
+include/mdds-1.0/mdds/multi_type_matrix_def.inl
+include/mdds-1.0/mdds/multi_type_vector.hpp
+include/mdds-1.0/mdds/multi_type_vector_custom_func1.hpp
+include/mdds-1.0/mdds/multi_type_vector_custom_func2.hpp
+include/mdds-1.0/mdds/multi_type_vector_custom_func3.hpp
+include/mdds-1.0/mdds/multi_type_vector_def.inl
+include/mdds-1.0/mdds/multi_type_vector_itr.hpp
+include/mdds-1.0/mdds/multi_type_vector_macro.hpp
+include/mdds-1.0/mdds/multi_type_vector_trait.hpp
+include/mdds-1.0/mdds/multi_type_vector_types.hpp
+include/mdds-1.0/mdds/node.hpp
+include/mdds-1.0/mdds/point_quad_tree.hpp
+include/mdds-1.0/mdds/quad_node.hpp
+include/mdds-1.0/mdds/rectangle_set.hpp
+include/mdds-1.0/mdds/rectangle_set_def.inl
+include/mdds-1.0/mdds/segment_tree.hpp
+include/mdds-1.0/mdds/segment_tree_def.inl
+include/mdds-1.0/mdds/sorted_string_map.hpp
+include/mdds-1.0/mdds/sorted_string_map_def.inl
+share/doc/mdds-1.0/AUTHORS
+share/doc/mdds-1.0/COPYING
+share/doc/mdds-1.0/NEWS
+share/doc/mdds-1.0/README.md
+share/doc/mdds-1.0/VERSION
+share/pkgconfig/mdds-1.0.pc
diff --git a/devel/mdds/buildlink3.mk b/devel/mdds/buildlink3.mk
index a066d809cf9..7716047ca13 100644
--- a/devel/mdds/buildlink3.mk
+++ b/devel/mdds/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.3 2013/10/09 14:29:47 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/02/13 08:40:22 wiz Exp $
 
 BUILDLINK_TREE+=	mdds
 
 .if !defined(MDDS_BUILDLINK3_MK)
 MDDS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mdds+=	mdds>=0.9.0nb1
+BUILDLINK_API_DEPENDS.mdds+=	mdds>=1.0.0
 BUILDLINK_PKGSRCDIR.mdds?=	../../devel/mdds
 # only contains header files
 BUILDLINK_DEPMETHOD.mdds?=	build
diff --git a/devel/mdds/distinfo b/devel/mdds/distinfo
index 642a56b5ec9..58e7c130efe 100644
--- a/devel/mdds/distinfo
+++ b/devel/mdds/distinfo
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.15 2015/11/03 03:27:49 agc Exp $
+$NetBSD: distinfo,v 1.16 2016/02/13 08:40:22 wiz Exp $
 
-SHA1 (mdds_0.12.1.tar.bz2) = e7469349f8d0c65545896fe553918f3ea93bd84d
-RMD160 (mdds_0.12.1.tar.bz2) = 351e681e04558a7cd4f8e16d8130c60c4760c7da
-SHA512 (mdds_0.12.1.tar.bz2) = 852f58e1f3c18aef78646c2bd6b34dc544fc06cba7ef6bda2a44fd5e681bf47bbf7389505061ddd81797b0bdf343e55f060397a1ccc582c73990bc74d36575a6
-Size (mdds_0.12.1.tar.bz2) = 153265 bytes
-SHA1 (patch-include_mdds_flat__segment__tree.hpp) = 3b5a0c3687ff5a5c53362fda4271d6eded2f327c
-SHA1 (patch-include_mdds_flat__segment__tree__def.inl) = 111c1c0d3e4d1bca421f962c41572a5f805d4e80
-SHA1 (patch-include_mdds_mixed__type__matrix__def.inl) = 602b7a2edfb7321404c5603265e553bf771de26c
-SHA1 (patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl) = bd5c00d8032a74fab956bc64d691f0da1bf0acf6
-SHA1 (patch-include_mdds_multi__type__vector__itr.hpp) = ac5db6ee22a6aced27346088ce3b597c91d01cc5
-SHA1 (patch-include_mdds_point__quad__tree.hpp) = 2237a712ef0b031d59846b08b087dc4e5ad5ac8e
-SHA1 (patch-src_flat__segment__tree__test.cpp) = 1b3345d1e7e97c503d757d163f47b14e2f43a707
+SHA1 (mdds_1.0.0.tar.bz2) = 07184e0f8912d61227d62a6698ebda53b34afae4
+RMD160 (mdds_1.0.0.tar.bz2) = aa89c35f3f13fa81b7e2aa738803e75aba65ac3d
+SHA512 (mdds_1.0.0.tar.bz2) = 12a77beab99fc26e8376c513a2c95dbee1645ae0765838ff1cadeefeb312b1e5524862461de51ed2e5d900f4166cbe03dd2eea8f1014ce79ae40357d34b65aef
+Size (mdds_1.0.0.tar.bz2) = 166619 bytes
diff --git a/devel/mdds/patches/patch-include_mdds_flat__segment__tree.hpp b/devel/mdds/patches/patch-include_mdds_flat__segment__tree.hpp
deleted file mode 100644
index a2756991ff6..00000000000
--- a/devel/mdds/patches/patch-include_mdds_flat__segment__tree.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-include_mdds_flat__segment__tree.hpp,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
-https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=bead58cb4042ac42dee890e2f21ab7ea81136e54
-
---- include/mdds/flat_segment_tree.hpp.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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/devel/mdds/patches/patch-include_mdds_flat__segment__tree__def.inl b/devel/mdds/patches/patch-include_mdds_flat__segment__tree__def.inl
deleted file mode 100644
index e0b88d60bd2..00000000000
--- a/devel/mdds/patches/patch-include_mdds_flat__segment__tree__def.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_mdds_flat__segment__tree__def.inl,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
-https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=bead58cb4042ac42dee890e2f21ab7ea81136e54
-
---- include/mdds/flat_segment_tree_def.inl.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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>
diff --git a/devel/mdds/patches/patch-include_mdds_mixed__type__matrix__def.inl b/devel/mdds/patches/patch-include_mdds_mixed__type__matrix__def.inl
deleted file mode 100644
index 3431431860b..00000000000
--- a/devel/mdds/patches/patch-include_mdds_mixed__type__matrix__def.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_mdds_mixed__type__matrix__def.inl,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
---- include/mdds/mixed_type_matrix_def.inl.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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);
diff --git a/devel/mdds/patches/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl b/devel/mdds/patches/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl
deleted file mode 100644
index 26439eb4d66..00000000000
--- a/devel/mdds/patches/patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-include_mdds_mixed__type__matrix__storage__filled__linear.inl,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
---- include/mdds/mixed_type_matrix_storage_filled_linear.inl.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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)
diff --git a/devel/mdds/patches/patch-include_mdds_multi__type__vector__itr.hpp b/devel/mdds/patches/patch-include_mdds_multi__type__vector__itr.hpp
deleted file mode 100644
index 29f19453a3d..00000000000
--- a/devel/mdds/patches/patch-include_mdds_multi__type__vector__itr.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-include_mdds_multi__type__vector__itr.hpp,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
---- include/mdds/multi_type_vector_itr.hpp.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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; }
diff --git a/devel/mdds/patches/patch-include_mdds_point__quad__tree.hpp b/devel/mdds/patches/patch-include_mdds_point__quad__tree.hpp
deleted file mode 100644
index 5953a520fd9..00000000000
--- a/devel/mdds/patches/patch-include_mdds_point__quad__tree.hpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-include_mdds_point__quad__tree.hpp,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
---- include/mdds/point_quad_tree.hpp.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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)
-     {
diff --git a/devel/mdds/patches/patch-src_flat__segment__tree__test.cpp b/devel/mdds/patches/patch-src_flat__segment__tree__test.cpp
deleted file mode 100644
index a285078dda5..00000000000
--- a/devel/mdds/patches/patch-src_flat__segment__tree__test.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_flat__segment__tree__test.cpp,v 1.1 2015/08/12 00:45:18 ryoon Exp $
-
-https://gerrit.libreoffice.org/gitweb?p=core.git;a=commit;h=bead58cb4042ac42dee890e2f21ab7ea81136e54
-
---- src/flat_segment_tree_test.cpp.orig	2015-06-11 23:53:55.000000000 +0000
-+++ 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()