Add missing <cstddef>. Fix use of iterator vs const_iterator.

8 files changed, 110 insertions, 1 deletions

diff --git a/devel/xsd/distinfo b/devel/xsd/distinfo
index b3bce0056b8..501943d8cc7 100644
--- a/devel/xsd/distinfo
+++ b/devel/xsd/distinfo
@@ -1,20 +1,27 @@
-$NetBSD: distinfo,v 1.3 2013/03/28 21:20:15 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/05/21 16:36:22 joerg Exp $
 
 SHA1 (xsd-3.2.0+dep.tar.bz2) = d57fd3b326dcfab3af8fdc40fc3cf27fb9d7c7c5
 RMD160 (xsd-3.2.0+dep.tar.bz2) = da02eb15e607ee9b434f2a729c6f8a3da0981348
 Size (xsd-3.2.0+dep.tar.bz2) = 1054603 bytes
+SHA1 (patch-libbackend-elements-1.6.1_backend-elements_indentation_cxx.hxx) = 8d57a1a35a69eef95d7aa0881721d03efd8b2f93
+SHA1 (patch-libcult-1.4.2_cult_cli_file-arguments.hxx) = e016fb9838c2eeca557c1001172721ad4f647e30
+SHA1 (patch-libcult-1.4.2_cult_containers_graph.txx) = 5e0976f3d8bf0f72eb575b95086d50d3c40fbf26
 SHA1 (patch-libcult-1.4.2_cult_mm_bits_evptr.hxx) = c0665ef9f6ee3c5ad1714988388d8c92cd9818ae
 SHA1 (patch-libcult-1.4.2_cult_mm_evptr.hxx) = d7aba021918d29ad5b5f4d5ea23e435b7d908e65
 SHA1 (patch-libcult-1.4.2_cult_mm_shptr.hxx) = b8f2d82601f43af706a65aedfcd7c1567e061db9
 SHA1 (patch-libcult-1.4.2_cult_mm_static-ptr.hxx) = 76225963ff8b710eafada502d4c0c918ffef416e
+SHA1 (patch-libcult-1.4.2_cult_types_fundamental.hxx) = 561512022a9c5d27fcf335ff569a0ec66535a1af
+SHA1 (patch-libfrontend-elements-1.1.1_frontend-elements_context.hxx) = 0c5f933efdfa8caf682c1744f6840eccb11e5193
 SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_parser.cxx) = 30a9b0aecf5605b6c37e72f1a3c8fbfce01140da
 SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.cxx) = 717fca1076c9c4e33a3577cb6c23fa0a9ec1ceab
+SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.hxx) = aeaf05bb21b0de2702a31cecc35a5d8bb7caece2
 SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_schema.hxx) = cbf09aa1272f6f163ce002db9f4578e5795eaaf3
 SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_transformations_anonymous.cxx) = cfe1f7d86725ef2736e6198f5f8780e3656ce6f4
 SHA1 (patch-libxsd-frontend-1.15.0_xsd-frontend_transformations_schema-per-type.cxx) = 0ed23703a8f11984dc51e2bbdcc744b32a5be369
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_elements.cxx) = 8006dc3a16d945a9c256e0fd2a4c412ad63e8919
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_parser_elements.cxx) = 06702b980f04c5718b7c0aefb8d629466501f0d2
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_parser_generator.cxx) = e56dce412f315f1b88f426480dc794a7f69e569a
+SHA1 (patch-xsd-3.2.0-2_xsd_cxx_parser_state-processor.cxx) = 7f6032eda05fa030a0abfbdb4ebfee75b5f6bb47
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_tree_elements.cxx) = df8759581d58e9b230dc4569d0bce3d23d5ab8ec
 SHA1 (patch-xsd-3.2.0-2_xsd_cxx_tree_generator.cxx) = 79c5927337f1a35e1d6ac53fbba429f1fc0350de
 SHA1 (patch-xsd-3.2.0-2_xsd_xsd.cxx) = e89a36f5616416ad31fa47b1bba2018cb3fbaec9
diff --git a/devel/xsd/patches/patch-libbackend-elements-1.6.1_backend-elements_indentation_cxx.hxx b/devel/xsd/patches/patch-libbackend-elements-1.6.1_backend-elements_indentation_cxx.hxx
new file mode 100644
index 00000000000..3a07b463b8b
--- /dev/null
+++ b/devel/xsd/patches/patch-libbackend-elements-1.6.1_backend-elements_indentation_cxx.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-libbackend-elements-1.6.1_backend-elements_indentation_cxx.hxx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- libbackend-elements-1.6.1/backend-elements/indentation/cxx.hxx.orig	2013-05-14 20:12:33.000000000 +0000
++++ libbackend-elements-1.6.1/backend-elements/indentation/cxx.hxx
+@@ -506,7 +506,7 @@ namespace BackendElements
+ 
+             // Reduce double newline after "}" into a single one.
+             //
+-            typename Hold::Iterator i (hold_.end ()), b (hold_.begin ());
++            typename Hold::ConstIterator i (hold_.end ()), b (hold_.begin ());
+ 
+             for (--i; i != b; --i)
+             {
diff --git a/devel/xsd/patches/patch-libcult-1.4.2_cult_cli_file-arguments.hxx b/devel/xsd/patches/patch-libcult-1.4.2_cult_cli_file-arguments.hxx
new file mode 100644
index 00000000000..6cb9dcd7d59
--- /dev/null
+++ b/devel/xsd/patches/patch-libcult-1.4.2_cult_cli_file-arguments.hxx
@@ -0,0 +1,14 @@
+$NetBSD: patch-libcult-1.4.2_cult_cli_file-arguments.hxx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- libcult-1.4.2/cult/cli/file-arguments.hxx.orig	2013-05-14 19:55:31.000000000 +0000
++++ libcult-1.4.2/cult/cli/file-arguments.hxx
+@@ -47,7 +47,8 @@ namespace Cult
+         if (i >= size ())
+           throw Bounds ();
+ 
+-        args_.erase (args_.begin () + i);
++        Containers::Vector<String>::ConstIterator b(args_.begin());
++        args_.erase (b + i);
+       }
+ 
+     private:
diff --git a/devel/xsd/patches/patch-libcult-1.4.2_cult_containers_graph.txx b/devel/xsd/patches/patch-libcult-1.4.2_cult_containers_graph.txx
new file mode 100644
index 00000000000..b13c96046b9
--- /dev/null
+++ b/devel/xsd/patches/patch-libcult-1.4.2_cult_containers_graph.txx
@@ -0,0 +1,13 @@
+$NetBSD: patch-libcult-1.4.2_cult_containers_graph.txx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- libcult-1.4.2/cult/containers/graph.txx.orig	2013-05-14 20:04:32.000000000 +0000
++++ libcult-1.4.2/cult/containers/graph.txx
+@@ -294,7 +294,7 @@ namespace Cult
+     Void Graph<N, E>::
+     delete_edge (Left& l, Right& r, T& edge)
+     {
+-      typename Edges::Iterator i (edges_.find (&edge));
++      typename Edges::ConstIterator i (edges_.find (&edge));
+ 
+       if (i == edges_.end () ||
+           nodes_.find (&l) == nodes_.end () ||
diff --git a/devel/xsd/patches/patch-libcult-1.4.2_cult_types_fundamental.hxx b/devel/xsd/patches/patch-libcult-1.4.2_cult_types_fundamental.hxx
new file mode 100644
index 00000000000..57a196e5d01
--- /dev/null
+++ b/devel/xsd/patches/patch-libcult-1.4.2_cult_types_fundamental.hxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-libcult-1.4.2_cult_types_fundamental.hxx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- libcult-1.4.2/cult/types/fundamental.hxx.orig	2013-05-14 19:54:41.000000000 +0000
++++ libcult-1.4.2/cult/types/fundamental.hxx
+@@ -7,6 +7,7 @@
+ #define CULT_TYPES_FUNDAMENTAL_HXX
+ 
+ #include <cstdlib> // std::size_t, std::ptrdiff_t
++#include <cstddef>
+ 
+ namespace Cult
+ {
diff --git a/devel/xsd/patches/patch-libfrontend-elements-1.1.1_frontend-elements_context.hxx b/devel/xsd/patches/patch-libfrontend-elements-1.1.1_frontend-elements_context.hxx
new file mode 100644
index 00000000000..5e1b44e2648
--- /dev/null
+++ b/devel/xsd/patches/patch-libfrontend-elements-1.1.1_frontend-elements_context.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-libfrontend-elements-1.1.1_frontend-elements_context.hxx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- libfrontend-elements-1.1.1/frontend-elements/context.hxx.orig	2013-05-14 19:57:57.000000000 +0000
++++ libfrontend-elements-1.1.1/frontend-elements/context.hxx
+@@ -111,7 +111,7 @@ namespace FrontendElements
+     Void
+     remove (Char const* key)
+     {
+-      Map::Iterator i (map_.find (key));
++      Map::ConstIterator i (map_.find (key));
+ 
+       if (i == map_.end ())
+         throw NoEntry ();
diff --git a/devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.hxx b/devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.hxx
new file mode 100644
index 00000000000..9279929b014
--- /dev/null
+++ b/devel/xsd/patches/patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.hxx
@@ -0,0 +1,13 @@
+$NetBSD: patch-libxsd-frontend-1.15.0_xsd-frontend_semantic-graph_elements.hxx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- libxsd-frontend-1.15.0/xsd-frontend/semantic-graph/elements.hxx.orig	2013-05-14 19:59:19.000000000 +0000
++++ libxsd-frontend-1.15.0/xsd-frontend/semantic-graph/elements.hxx
+@@ -577,7 +577,7 @@ namespace XSDFrontend
+       Void
+       remove_edge_left (Names& e)
+       {
+-        ListIteratorMap::Iterator i (iterator_map_.find (&e));
++        ListIteratorMap::ConstIterator i (iterator_map_.find (&e));
+         assert (i != iterator_map_.end ());
+ 
+         names_.erase (i->second);
diff --git a/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_state-processor.cxx b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_state-processor.cxx
new file mode 100644
index 00000000000..b6eecc5ba7d
--- /dev/null
+++ b/devel/xsd/patches/patch-xsd-3.2.0-2_xsd_cxx_parser_state-processor.cxx
@@ -0,0 +1,24 @@
+$NetBSD: patch-xsd-3.2.0-2_xsd_cxx_parser_state-processor.cxx,v 1.1 2013/05/21 16:36:22 joerg Exp $
+
+--- xsd-3.2.0-2/xsd/cxx/parser/state-processor.cxx.orig	2013-05-14 20:08:50.000000000 +0000
++++ xsd-3.2.0-2/xsd/cxx/parser/state-processor.cxx
+@@ -154,7 +154,8 @@ namespace CXX
+               if (++depth > depth_) // One for this compositor.
+                 depth_ = depth;
+ 
+-              prefixes_.insert (prefixes_.end (),
++              Particles::ConstIterator e(prefixes_.end ());
++              prefixes_.insert (e,
+                                 t.prefixes_.begin ().base (),
+                                 t.prefixes_.end ().base ());
+ 
+@@ -231,7 +232,8 @@ namespace CXX
+ 
+               if (prefix)
+               {
+-                prefixes_.insert (prefixes_.end (),
++                Particles::ConstIterator e(prefixes_.end ());
++                prefixes_.insert (e,
+                                   t.prefixes_.begin ().base (),
+                                   t.prefixes_.end ().base ());
+