rebasing new packages?!

[Jason Tishler]

Rob,

On Mon, May 06, 2002 at 10:56:30AM -0400, Jason Tishler wrote:
> On Sat, May 04, 2002 at 09:37:48AM +1000, Robert Collins wrote:
> > > -----Original Message-----
> > > From: Jason Tishler [mailto:jason@tishler.net] 
> > > Sent: Saturday, May 04, 2002 3:34 AM
> > > 
> > > Can we remove the "-Werror" option and start using STL in setup.exe?
> > 
> > [snip]
> >
> > Perhaps removing the explicit inline from the definition is appropriate?
> 
> Bingo.  That fixed the problem.

Actually, the previous patch caused multiple definition errors during
linking.  Is the attached an acceptable alternative?

Thanks,
Jason
-------------- next part --------------
--- stl_tree.h.orig	2002-05-06 10:38:33.000000000 -0400
+++ stl_tree.h	2002-06-03 15:41:11.000000000 -0400
@@ -1253,7 +1253,7 @@ _Rb_tree<_Key, _Value, _KoV, _Compare, _
                                              upper_bound(__k));
 }
 
-inline int 
+static int 
 __black_count(_Rb_tree_node_base* __node, _Rb_tree_node_base* __root)
 {
   if (__node == 0)