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


(joerg)

$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)
             {

$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:

$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 () ||

$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
 {

$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 ();

$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);

$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 ());