Index: iterator.hpp
===================================================================
--- iterator.hpp	(revision 84053)
+++ iterator.hpp	(working copy)
@@ -143,7 +143,6 @@
 struct iterator< ::boost::no_traversal_tag, T, Reference, DifferenceType, ValueType> :
     boost::mpl::vector<
         copy_constructible<T>,
-        constructible<T()>,
         equality_comparable<T>,
         dereferenceable<typename iterator_reference<Reference, ValueType>::type, T>,
         assignable<T>
@@ -157,7 +156,7 @@
 template<class T, class Reference, class DifferenceType, class ValueType>
 struct iterator< ::boost::incrementable_traversal_tag, T, Reference, DifferenceType, ValueType> :
     boost::mpl::vector<
-        iterator< ::boost::no_traversal_tag, T, Reference, DifferenceType>,
+        iterator< ::boost::no_traversal_tag, T, Reference, DifferenceType, ValueType>,
         incrementable<T>
     >
 {
@@ -173,13 +172,23 @@
 
 template<class T, class Reference, class DifferenceType, class ValueType>
 struct iterator< ::boost::forward_traversal_tag, T, Reference, DifferenceType, ValueType> :
-    iterator< ::boost::incrementable_traversal_tag, T, Reference, DifferenceType, ValueType>
-{};
+    boost::mpl::vector<
+        iterator< ::boost::no_traversal_tag, T, Reference, DifferenceType, ValueType>,
+        incrementable<T>,
+        constructible<T()>
+    >
+{
+    typedef ValueType value_type;
+    typedef typename iterator_reference<Reference, ValueType>::type reference;
+    typedef DifferenceType difference_type;
+};
 
 template<class T, class Reference, class DifferenceType, class ValueType>
 struct iterator< ::boost::bidirectional_traversal_tag, T, Reference, DifferenceType, ValueType> :
     boost::mpl::vector<
-        iterator< ::boost::incrementable_traversal_tag, T, Reference, DifferenceType, ValueType>,
+        iterator< ::boost::no_traversal_tag, T, Reference, DifferenceType, ValueType>,
+        incrementable<T>,
+        constructible<T()>,
         decrementable<T>
     >
 {
@@ -191,7 +200,10 @@
 template<class T, class Reference, class DifferenceType, class ValueType>
 struct iterator< ::boost::random_access_traversal_tag, T, Reference, DifferenceType, ValueType> :
     boost::mpl::vector<
-        iterator< ::boost::bidirectional_traversal_tag, T, Reference, DifferenceType, ValueType>,
+        iterator< ::boost::no_traversal_tag, T, Reference, DifferenceType, ValueType>,
+        incrementable<T>,
+        constructible<T()>,
+        decrementable<T>,
         addable<T, DifferenceType, T>,
         addable<DifferenceType, T, T>,
         subtractable<T, DifferenceType, T>,
@@ -256,6 +268,20 @@
 };
 
 template<class T, class Reference, class DifferenceType, class ValueType, class Base>
+struct concept_interface<iterator< ::boost::incrementable_traversal_tag, T, Reference, DifferenceType, ValueType>, Base, T>
+    : Base
+{
+    typedef std::output_iterator_tag iterator_category;
+};
+
+template<class T, class Reference, class DifferenceType, class ValueType, class Base>
+struct concept_interface<iterator< ::boost::single_pass_traversal_tag, T, Reference, DifferenceType, ValueType>, Base, T>
+    : Base
+{
+    typedef std::input_iterator_tag iterator_category;
+};
+
+template<class T, class Reference, class DifferenceType, class ValueType, class Base>
 struct concept_interface<iterator< ::boost::forward_traversal_tag, T, Reference, DifferenceType, ValueType>, Base, T>
     : Base
 {