# 
# 
# patch "ChangeLog"
#  from [bfcbdb585f62b5bfaaa03bc43ea9b0e103ef2866]
#    to [cef599f53ec924444fa3b57f106bff8360be01a8]
# 
# patch "boost/format/feed_args.hpp"
#  from [2e40edf9fe352317f27889aef86a73be58918b57]
#    to [2383c7b634aed327cfd1af7a119fed4951a5a1d7]
# 
# patch "vocab.cc"
#  from [60e45ab733092ce9146d8b5b64f799669d3bcaf6]
#    to [b770a2970961886842d185bb6aa627ca20300994]
# 
============================================================
--- ChangeLog	bfcbdb585f62b5bfaaa03bc43ea9b0e103ef2866
+++ ChangeLog	cef599f53ec924444fa3b57f106bff8360be01a8
@@ -1,3 +1,8 @@
+2006-06-08  Matt Johnston  <address@hidden>
+
+	* boost/format/feed_args.hpp: 0 needs to be unsigned.
+	* vocab.cc: #undef EXTERN before #defining it again
+
 2006-06-07  Patrick Mauritz  <address@hidden>
 
 	* cert.cc:
============================================================
--- boost/format/feed_args.hpp	2e40edf9fe352317f27889aef86a73be58918b57
+++ boost/format/feed_args.hpp	2383c7b634aed327cfd1af7a119fed4951a5a1d7
@@ -156,7 +156,7 @@
                     prefix_space = oss.widen(' ');
             size_type res_size = (std::min)(
                 static_cast<size_type>(specs.truncate_ - !!prefix_space), 
-                static_cast<size_type>(std::max(0,buf.pcount())) );
+                static_cast<size_type>(std::max((size_type)0,buf.pcount())) );
 			if (res_size)
 	            mk_str(res, res_beg, res_size, w, oss.fill(), fl, 
 		               prefix_space, (specs.pad_scheme_ & format_item_t::centered) !=0 );
@@ -201,7 +201,7 @@
                 // we now have the minimal-length output
                 const Ch * tmp_beg = buf.pbase();
                 size_type tmp_size = (std::min)(static_cast<size_type>(specs.truncate_),
-                                                static_cast<size_type>(std::max(0,buf.pcount())) );
+                                                static_cast<size_type>(std::max((size_type)0,buf.pcount())) );
                                                     
                 
                 if(static_cast<size_type>(w) <= tmp_size) { 
============================================================
--- vocab.cc	60e45ab733092ce9146d8b5b64f799669d3bcaf6
+++ vocab.cc	b770a2970961886842d185bb6aa627ca20300994
@@ -196,6 +196,9 @@
 #define ATOMIC(ty) cc_ATOMIC(ty)
 #define ATOMIC_NOVERIFY(ty) cc_ATOMIC_NOVERIFY(ty)
 
+#ifdef EXTERN
+#undef EXTERN
+#endif
 #define EXTERN
 
 #include "vocab_terms.hh"