#
#
# patch "boost/circular_buffer_base.hpp"
#  from [4f16597bb79b6728ff2b7f8bef07e036a60b2d46]
#    to [3a61ebf01a1c3c612d2c0748ee69b1e89a4e25c1]
# 
# patch "debian/changelog"
#  from [6dd849d90877b06ce2b9ef7ee9aa65071ef6102f]
#    to [165e2ea35f4b4ac41cc4250c97c6ef887770af66]
# 
# patch "roster.cc"
#  from [98be4bba97d68e5095a33bae6b8b5f037871fbef]
#    to [ea77660276baf407ff4c1fcad6bef44d8c9dc675]
#
============================================================
--- boost/circular_buffer_base.hpp	4f16597bb79b6728ff2b7f8bef07e036a60b2d46
+++ boost/circular_buffer_base.hpp	3a61ebf01a1c3c612d2c0748ee69b1e89a4e25c1
@@ -496,10 +496,10 @@ public:
 
 #if BOOST_VERSION >= 103100
     //! Const iterator used to iterate backwards through a circular buffer.
-    typedef reverse_iterator<const_iterator> const_reverse_iterator;
+    typedef boost::reverse_iterator<const_iterator> const_reverse_iterator;
 
     //! Iterator used to iterate backwards through a circular buffer.
-    typedef reverse_iterator<iterator> reverse_iterator;
+    typedef boost::reverse_iterator<iterator> reverse_iterator;
 #else 
     //! Const iterator used to iterate backwards through a circular buffer.
     typedef typename reverse_iterator_generator<const_iterator>::type const_reverse_iterator;
============================================================
--- debian/changelog	6dd849d90877b06ce2b9ef7ee9aa65071ef6102f
+++ debian/changelog	165e2ea35f4b4ac41cc4250c97c6ef887770af66
@@ -1,6 +1,7 @@ monotone (0.39-1) UNRELEASED; urgency=lo
 monotone (0.39-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    - Can now be built with gcc 4.3 snapshots.  (Closes: #455646)
   * Enable use of system libpcre, set appropriate Build-Depends.
 
  -- J Maintainer <address@hidden>  ???, ?? ??? ???? ??:??:?? +????
============================================================
--- roster.cc	98be4bba97d68e5095a33bae6b8b5f037871fbef
+++ roster.cc	ea77660276baf407ff4c1fcad6bef44d8c9dc675
@@ -3524,8 +3524,10 @@ namespace
 
   struct a_scalar
   {
+    // Must use std::set in arguments to avoid "changes meaning" errors.
     virtual void set(revision_id const & scalar_origin_rid,
-                     scalar_val val, set<revision_id> const & this_scalar_mark,
+                     scalar_val val,
+                     std::set<revision_id> const & this_scalar_mark,
                      roster_t & roster, marking_map & markings)
       = 0;
     virtual ~a_scalar() {};