This commit was manufactured by cvs2svn to create tag

'Version_1_33_1'.

[SVN r31916]

include/boost/iterator/counting_iterator.hpp

@@ -172,7 +172,7 @@ class counting_iterator
 # if 0
     template<class OtherIncrementable>
     counting_iterator(
-        counting_iterator<OtherIncrementable> const& t
+        counting_iterator<OtherIncrementable, CategoryOrTraversal, Difference> const& t
       , typename enable_if_convertible<OtherIncrementable, Incrementable>::type* = 0
     )
       : super_t(t.base())
@@ -188,7 +188,7 @@ class counting_iterator
 
     template <class OtherIncrementable>
     difference_type
-    distance_to(counting_iterator<OtherIncrementable> const& y) const
+    distance_to(counting_iterator<OtherIncrementable, CategoryOrTraversal, Difference> const& y) const
     {
       typedef typename mpl::if_<
           detail::is_numeric<Incrementable>

include/boost/iterator/is_lvalue_iterator.hpp

@@ -33,7 +33,7 @@ namespace detail
   template <class U>
   not_an_lvalue lvalue_preserver(U const&, ...);
   
-# define BOOST_LVALUE_PRESERVER(expr) lvalue_preserver(expr,0)
+# define BOOST_LVALUE_PRESERVER(expr) detail::lvalue_preserver(expr,0)
   
 #else
   

test/counting_iterator_test.cpp

@@ -277,6 +277,7 @@ int main()
     // Test user-defined type.
 
     test_integer3<my_int1, std::forward_iterator_tag, int>();
+    test_integer3<long, std::random_access_iterator_tag, int>();
     test_integer<my_int2>();
     test_integer<my_int3>();
     

test/iterator_traits_test.cpp

@@ -161,6 +161,10 @@ non_pointer_test<std::ostream_iterator<int>,int,
 non_pointer_test<std::ostream_iterator<int>,
     int, void, int*, int&, std::output_iterator_tag>
         ostream_iterator_test;
+#elif BOOST_WORKAROUND(__DECCXX_VER, BOOST_TESTED_AT(70190006))
+non_pointer_test<std::ostream_iterator<int>,
+    int, long, int*, int&, std::output_iterator_tag>
+        ostream_iterator_test;
 #else
 non_pointer_test<std::ostream_iterator<int>,
     void, void, void, void, std::output_iterator_tag>