Index: boost/property_map_iterator.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/property_map_iterator.hpp,v
retrieving revision 1.4
diff -u -r1.4 property_map_iterator.hpp
--- boost/property_map_iterator.hpp	27 Dec 2002 16:51:53 -0000	1.4
+++ boost/property_map_iterator.hpp	11 Dec 2003 18:27:14 -0000
@@ -10,89 +10,103 @@
 #define BOOST_PROPERTY_MAP_ITERATOR_HPP
 
 #include <boost/property_map.hpp>
-#include <boost/iterator_adaptors.hpp>
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/type_traits/is_same.hpp>
 
 namespace boost {
 
-  //======================================================================
-  // property iterator, generalized from ideas by François Faure
+    //======================================================================
+    // property iterator, generalized from ideas by François Faure
 
-  namespace detail {
+    namespace detail {
 
-    template <class LvaluePropertyMap>
-    struct lvalue_pmap_iter_policies : public default_iterator_policies
+        template <class Iterator, class LvaluePropertyMap>
+        class lvalue_pmap_iter
+            : public iterator_adaptor< lvalue_pmap_iter< Iterator, LvaluePropertyMap >,
+                                       Iterator,
+                                       typename property_traits<LvaluePropertyMap>::value_type,
+                                       use_default,
+                                       typename property_traits<LvaluePropertyMap>::reference>
+        {
+            friend class boost::iterator_core_access;
+
+            typedef iterator_adaptor< lvalue_pmap_iter< Iterator, LvaluePropertyMap >,
+                                      Iterator,
+                                      typename property_traits<LvaluePropertyMap>::value_type,
+                                      use_default,
+                                      typename property_traits<LvaluePropertyMap>::reference> super_t;
+
+        public:
+            lvalue_pmap_iter() { }
+            lvalue_pmap_iter(Iterator const&     it,
+                             LvaluePropertyMap m)
+                : super_t(it),
+                  m_map(m) {}
+
+        private:
+            typename lvalue_pmap_iter::reference
+            dereference() const
+            {
+                return m_map[*base_reference()];
+            }
+
+            LvaluePropertyMap m_map;
+        };
+
+        template <class Iterator, class ReadablePropertyMap>
+        class readable_pmap_iter :
+            public iterator_adaptor< readable_pmap_iter< Iterator, ReadablePropertyMap >,
+                                     Iterator,
+                                     typename property_traits<ReadablePropertyMap>::value_type,
+                                     use_default,
+                                     typename property_traits<ReadablePropertyMap>::value_type>
+
+
+        {
+            friend class iterator_core_access;
+
+            typedef iterator_adaptor< readable_pmap_iter< Iterator, ReadablePropertyMap >,
+                                      Iterator,
+                                      typename property_traits<ReadablePropertyMap>::value_type,
+                                      use_default,
+                                      typename property_traits<ReadablePropertyMap>::value_type> super_t;
+
+        public:
+            readable_pmap_iter() { }
+            readable_pmap_iter(Iterator const&     it,
+                               ReadablePropertyMap m)
+                : super_t(it),
+                  m_map(m) {}
+
+        private:
+            typename readable_pmap_iter::reference
+            dereference() const
+            {
+                return get(m_map, *base_reference());
+            }
+
+            ReadablePropertyMap m_map;
+        };
+
+
+    } // namespace detail
+
+
+    template <class PropertyMap, class Iterator>
+    struct property_map_iterator_generator :
+        mpl::if_< is_same< typename property_traits<PropertyMap>::category, lvalue_property_map_tag>,
+                  detail::lvalue_pmap_iter<Iterator, PropertyMap>,
+                  detail::readable_pmap_iter<Iterator, PropertyMap> >
+    {};
+
+    template <class PropertyMap, class Iterator>
+    typename property_map_iterator_generator<PropertyMap, Iterator>::type
+    make_property_map_iterator(PropertyMap pmap, Iterator iter)
     {
-      lvalue_pmap_iter_policies() { }
-      lvalue_pmap_iter_policies(LvaluePropertyMap m) : m_map(m) {}
-
-      template <class Iter>
-      typename Iter::reference
-      dereference(const Iter& i) const 
-      {
-        return m_map[*i.base()];
-      }
-    private:
-      LvaluePropertyMap m_map;
-    };
-
-    template <class ReadablePropertyMap>
-    struct readable_pmap_iter_policies : public default_iterator_policies
-    {
-      readable_pmap_iter_policies() { }
-      readable_pmap_iter_policies(ReadablePropertyMap m) : m_map(m) {}
-
-      template <class Iter>
-      typename Iter::reference
-      dereference(const Iter& i) const 
-      {
-        return get(m_map, *i.base());
-      }
-    private:
-      ReadablePropertyMap m_map;
-    };
-
-    template <class PMapCategory>
-    struct choose_pmap_iter {
-      template <class PMap, class Iter>
-      struct bind_ {     
-        typedef typename property_traits<PMap>::value_type value;
-        typedef iterator_adaptor<Iter,
-          readable_pmap_iter_policies<PMap>, value, value,
-          value*, std::input_iterator_tag> type;
-      };
-    };
-
-    template <>
-    struct choose_pmap_iter<lvalue_property_map_tag> {
-      template <class PMap, class Iter>
-      struct bind_ {
-        typedef typename property_traits<PMap>::value_type value;
-        typedef typename property_traits<PMap>::reference ref;
-        typedef iterator_adaptor<Iter,
-          lvalue_pmap_iter_policies<PMap>,
-          value, ref> type;
-      };
-    };
-    
-  } // namespace detail
-
-  template <class PropertyMap, class Iterator>
-  class property_map_iterator_generator {
-  public:
-    typedef typename property_traits<PropertyMap>::category Cat; 
-    typedef typename detail::choose_pmap_iter<Cat>::
-      template bind_<PropertyMap, Iterator>::type type;
-  };
-
-  template <class PropertyMap, class Iterator>
-  typename property_map_iterator_generator<PropertyMap, Iterator>::type
-  make_property_map_iterator(PropertyMap pmap, Iterator iter)
-  {
-    typedef typename property_map_iterator_generator<PropertyMap, 
-      Iterator>::type Iter;
-    return Iter(iter, pmap);
-  }
-
+        typedef typename property_map_iterator_generator<PropertyMap, Iterator>::type Iter;
+        return Iter(iter, pmap);
+    }
 } // namespace boost
 
 #endif // BOOST_PROPERTY_MAP_ITERATOR_HPP