Add support for STL-conforming iterators

The new XSDE_STL_ITERATOR configuration variable is used to conditionally
turn this on.

21 files changed, 310 insertions, 152 deletions

diff --git a/dist/config/config.make b/dist/config/config.make
index e0eb217..ac3518c 100644
--- a/dist/config/config.make
+++ b/dist/config/config.make
@@ -29,47 +29,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := y
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := y
+XSDE_SNPRINTF     := y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/config/config.nmake b/dist/config/config.nmake
index d09bb07..599d660 100644
--- a/dist/config/config.nmake
+++ b/dist/config/config.nmake
@@ -28,47 +28,55 @@ XSDFLAGS = --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   = win32
+XSDE_PLATFORM     = win32
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH = 32
+XSDE_ARCH_WIDTH   = 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  = l
+XSDE_BYTEORDER    = l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        = y
+XSDE_STL          = y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR = y
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   = y
+XSDE_IOSTREAM     = y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS = y
+XSDE_EXCEPTIONS   = y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   = n
+XSDE_LONGLONG     = n
 
 
 # Set to 'n' if your platform doesn't have the _snprintf function.
 #
-XSDE_SNPRINTF   = y
+XSDE_SNPRINTF     = y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/evc-4.0/config.nmake b/dist/etc/evc-4.0/config.nmake
index 9afda7a..cb4777f 100644
--- a/dist/etc/evc-4.0/config.nmake
+++ b/dist/etc/evc-4.0/config.nmake
@@ -31,47 +31,55 @@ XSDFLAGS = --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   = wince
+XSDE_PLATFORM     = wince
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH = 32
+XSDE_ARCH_WIDTH   = 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  = l
+XSDE_BYTEORDER    = l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        = n
+XSDE_STL          = n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR = n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   = n
+XSDE_IOSTREAM     = n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS = n
+XSDE_EXCEPTIONS   = n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   = n
+XSDE_LONGLONG     = n
 
 
 # Set to 'n' if your platform doesn't have the _snprintf function.
 #
-XSDE_SNPRINTF   = n
+XSDE_SNPRINTF     = n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/iphone/config-device.make b/dist/etc/iphone/config-device.make
index 2bd5f80..a52c484 100644
--- a/dist/etc/iphone/config-device.make
+++ b/dist/etc/iphone/config-device.make
@@ -36,47 +36,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := y
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := y
+XSDE_SNPRINTF     := y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/iphone/config-simulator.make b/dist/etc/iphone/config-simulator.make
index eb989a4..3ab24df 100644
--- a/dist/etc/iphone/config-simulator.make
+++ b/dist/etc/iphone/config-simulator.make
@@ -36,47 +36,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := y
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := y
+XSDE_SNPRINTF     := y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/lynxos/config-4.2.make b/dist/etc/lynxos/config-4.2.make
index 3dd3c5b..beb401e 100644
--- a/dist/etc/lynxos/config-4.2.make
+++ b/dist/etc/lynxos/config-4.2.make
@@ -35,47 +35,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/lynxos/config-5.0.make b/dist/etc/lynxos/config-5.0.make
index 0aaa569..3c64855 100644
--- a/dist/etc/lynxos/config-5.0.make
+++ b/dist/etc/lynxos/config-5.0.make
@@ -35,47 +35,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/qnx/config-6.3-gcc-2.95.make b/dist/etc/qnx/config-6.3-gcc-2.95.make
index bbacd4c..4a6bb1b 100644
--- a/dist/etc/qnx/config-6.3-gcc-2.95.make
+++ b/dist/etc/qnx/config-6.3-gcc-2.95.make
@@ -34,47 +34,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := n
+XSDE_STL          := n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := n
+XSDE_IOSTREAM     := n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := n
+XSDE_EXCEPTIONS   := n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := y
+XSDE_SNPRINTF     := y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/qnx/config-6.3-gcc-3.3.make b/dist/etc/qnx/config-6.3-gcc-3.3.make
index a1fb72a..770693b 100644
--- a/dist/etc/qnx/config-6.3-gcc-3.3.make
+++ b/dist/etc/qnx/config-6.3-gcc-3.3.make
@@ -34,47 +34,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := y
+XSDE_SNPRINTF     := y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/qnx/config-6.4.make b/dist/etc/qnx/config-6.4.make
index 4c850f8..a302d0d 100644
--- a/dist/etc/qnx/config-6.4.make
+++ b/dist/etc/qnx/config-6.4.make
@@ -34,47 +34,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := y
+XSDE_LONGLONG     := y
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := y
+XSDE_SNPRINTF     := y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vc-8.0/config-max.nmake b/dist/etc/vc-8.0/config-max.nmake
index 3d20d3c..07b46bb 100644
--- a/dist/etc/vc-8.0/config-max.nmake
+++ b/dist/etc/vc-8.0/config-max.nmake
@@ -32,47 +32,55 @@ XSDFLAGS = --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   = wince
+XSDE_PLATFORM     = wince
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH = 32
+XSDE_ARCH_WIDTH   = 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  = l
+XSDE_BYTEORDER    = l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        = y
+XSDE_STL          = y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR = n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   = y
+XSDE_IOSTREAM     = y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS = y
+XSDE_EXCEPTIONS   = y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   = n
+XSDE_LONGLONG     = n
 
 
 # Set to 'n' if your platform doesn't have the _snprintf function.
 #
-XSDE_SNPRINTF   = y
+XSDE_SNPRINTF     = y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vc-8.0/config-min.nmake b/dist/etc/vc-8.0/config-min.nmake
index e06055e..286e349 100644
--- a/dist/etc/vc-8.0/config-min.nmake
+++ b/dist/etc/vc-8.0/config-min.nmake
@@ -32,47 +32,55 @@ XSDFLAGS = --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   = wince
+XSDE_PLATFORM     = wince
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH = 32
+XSDE_ARCH_WIDTH   = 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  = l
+XSDE_BYTEORDER    = l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        = n
+XSDE_STL          = n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR = n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   = n
+XSDE_IOSTREAM     = n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS = n
+XSDE_EXCEPTIONS   = n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   = n
+XSDE_LONGLONG     = n
 
 
 # Set to 'n' if your platform doesn't have the _snprintf function.
 #
-XSDE_SNPRINTF   = y
+XSDE_SNPRINTF     = y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vc-9.0/config-max.nmake b/dist/etc/vc-9.0/config-max.nmake
index 9442bc0..938bc3d 100644
--- a/dist/etc/vc-9.0/config-max.nmake
+++ b/dist/etc/vc-9.0/config-max.nmake
@@ -32,47 +32,55 @@ XSDFLAGS = --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   = wince
+XSDE_PLATFORM     = wince
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH = 32
+XSDE_ARCH_WIDTH   = 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  = l
+XSDE_BYTEORDER    = l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        = y
+XSDE_STL          = y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR = n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   = y
+XSDE_IOSTREAM     = y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS = y
+XSDE_EXCEPTIONS   = y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   = n
+XSDE_LONGLONG     = n
 
 
 # Set to 'n' if your platform doesn't have the _snprintf function.
 #
-XSDE_SNPRINTF   = y
+XSDE_SNPRINTF     = y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vc-9.0/config-min.nmake b/dist/etc/vc-9.0/config-min.nmake
index e55924b..b98e9a9 100644
--- a/dist/etc/vc-9.0/config-min.nmake
+++ b/dist/etc/vc-9.0/config-min.nmake
@@ -32,47 +32,55 @@ XSDFLAGS = --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   = wince
+XSDE_PLATFORM     = wince
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH = 32
+XSDE_ARCH_WIDTH   = 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  = l
+XSDE_BYTEORDER    = l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        = n
+XSDE_STL          = n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR = n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   = n
+XSDE_IOSTREAM     = n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS = n
+XSDE_EXCEPTIONS   = n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   = n
+XSDE_LONGLONG     = n
 
 
 # Set to 'n' if your platform doesn't have the _snprintf function.
 #
-XSDE_SNPRINTF   = y
+XSDE_SNPRINTF     = y
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vxworks/config-5.5.1.make b/dist/etc/vxworks/config-5.5.1.make
index f0adac3..9d6d8c5 100644
--- a/dist/etc/vxworks/config-5.5.1.make
+++ b/dist/etc/vxworks/config-5.5.1.make
@@ -35,47 +35,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := b
+XSDE_BYTEORDER    := b
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := n
+XSDE_STL          := n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := n
+XSDE_IOSTREAM     := n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := n
+XSDE_EXCEPTIONS   := n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := n
+XSDE_LONGLONG     := n
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vxworks/config-6.4-max.make b/dist/etc/vxworks/config-6.4-max.make
index a47fe7e..0d7ba41 100644
--- a/dist/etc/vxworks/config-6.4-max.make
+++ b/dist/etc/vxworks/config-6.4-max.make
@@ -47,47 +47,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := n
+XSDE_LONGLONG     := n
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vxworks/config-6.4-min.make b/dist/etc/vxworks/config-6.4-min.make
index da395e8..3efd917 100644
--- a/dist/etc/vxworks/config-6.4-min.make
+++ b/dist/etc/vxworks/config-6.4-min.make
@@ -34,47 +34,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := n
+XSDE_STL          := n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := n
+XSDE_IOSTREAM     := n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := n
+XSDE_EXCEPTIONS   := n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := n
+XSDE_LONGLONG     := n
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vxworks/config-6.7-max.make b/dist/etc/vxworks/config-6.7-max.make
index 762ca51..f6e8674 100644
--- a/dist/etc/vxworks/config-6.7-max.make
+++ b/dist/etc/vxworks/config-6.7-max.make
@@ -47,47 +47,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := y
+XSDE_STL          := y
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := y
+XSDE_IOSTREAM     := y
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := y
+XSDE_EXCEPTIONS   := y
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := n
+XSDE_LONGLONG     := n
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/etc/vxworks/config-6.7-min.make b/dist/etc/vxworks/config-6.7-min.make
index 206c719..42861a3 100644
--- a/dist/etc/vxworks/config-6.7-min.make
+++ b/dist/etc/vxworks/config-6.7-min.make
@@ -34,47 +34,55 @@ XSDFLAGS := --generate-inline
 # 'win32'  - Windows 2000, XP, etc.
 # 'posix'  - POSIX OS, including UNIX/Linux, VxWorks, etc.
 #
-XSDE_PLATFORM   := posix
+XSDE_PLATFORM     := posix
 
 
 # Platform architecture width in bits.
 #
-XSDE_ARCH_WIDTH := 32
+XSDE_ARCH_WIDTH   := 32
 
 
 # Platform byte order. Valid values are 'b' for big-endian
 # and 'l' for little-endian.
 #
-XSDE_BYTEORDER  := l
+XSDE_BYTEORDER    := l
 
 
 # Set to 'n' if you don't have STL (std::string, etc.). Also don't
 # forget to use the --no-stl option when compiling your schemas.
 #
-XSDE_STL        := n
+XSDE_STL          := n
+
+
+# Set to 'n' if you don't want iterators to conform to the STL
+# requirements. This feature requires working <iterator> header
+# and allows you to use the standard algorithms such as find_if,
+# etc.
+#
+XSDE_STL_ITERATOR := n
 
 
 # Set to 'n' if you don't have iostream.
 #
-XSDE_IOSTREAM   := n
+XSDE_IOSTREAM     := n
 
 
 # Set to 'n' if you don't have C++ exceptions. Also don't forget to
 # use the --no-exceptions option when compiling your schemas.
 #
-XSDE_EXCEPTIONS := n
+XSDE_EXCEPTIONS   := n
 
 
 # Set to 'n' if your platform doesn't have the "long long int" type or
 # the strtoull function. Also don't forget to use the --no-long-long
 # option when compiling your schemas.
 #
-XSDE_LONGLONG   := n
+XSDE_LONGLONG     := n
 
 
 # Set to 'n' if your platform doesn't have the snprintf function.
 #
-XSDE_SNPRINTF   := n
+XSDE_SNPRINTF     := n
 
 
 # Set to 'n' if you don't want support for XML Schema validation in
diff --git a/dist/libxsde/xsde/makefile b/dist/libxsde/xsde/makefile
index 142c269..90f2252 100644
--- a/dist/libxsde/xsde/makefile
+++ b/dist/libxsde/xsde/makefile
@@ -509,6 +509,9 @@ endif
 ifeq ($(XSDE_STL),y)
 	@echo $(h)define XSDE_STL                   >>$@
 endif
+ifeq ($(XSDE_STL_ITERATOR),y)
+	@echo $(h)define XSDE_STL_ITERATOR          >>$@
+endif
 ifeq ($(XSDE_IOSTREAM),y)
 	@echo $(h)define XSDE_IOSTREAM              >>$@
 endif
diff --git a/dist/libxsde/xsde/nmakefile b/dist/libxsde/xsde/nmakefile
index 888ca15..8eac019 100644
--- a/dist/libxsde/xsde/nmakefile
+++ b/dist/libxsde/xsde/nmakefile
@@ -504,6 +504,9 @@ config.h:
 !if "$(XSDE_STL)" == "y"
 	@echo #define XSDE_STL                    >>$@
 !endif
+!if "$(XSDE_STL_ITERATOR)" == "y"
+	@echo #define XSDE_STL_ITERATOR           >>$@
+!endif
 !if "$(XSDE_IOSTREAM)" == "y"
 	@echo #define XSDE_IOSTREAM               >>$@
 !endif