incubator-stdcxx-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Martin Sebor <se...@roguewave.com>
Subject Re: diffs between trunk and 4.2.x
Date Thu, 24 Apr 2008 22:57:16 GMT
Travis Vitek wrote:
> I've run a quick diff of the code on trunk and 4.2.x (include,src,tests)
> to be sure that everything that should have been merged over has been
> merged. Here is what I've found...

Thanks! This is very helpful.

> 
> Changes on 4.2.x, but not on trunk
> 
>   http://svn.apache.org/viewvc?view=rev&revision=650742
>   http://svn.apache.org/viewvc?view=rev&revision=649727
>   http://svn.apache.org/viewvc?view=rev&revision=650710
> 
> Changes on trunk, but not on 4.2.x
> 
>   http://svn.apache.org/viewvc?view=rev&revision=629207
>   http://svn.apache.org/viewvc?view=rev&revision=648509
>   http://svn.apache.org/viewvc?view=rev&revision=648403 *
>   http://svn.apache.org/viewvc?view=rev&revision=650367
>   http://svn.apache.org/viewvc?view=rev&revision=650584
>   http://svn.apache.org/viewvc?view=rev&revision=649665
>   http://svn.apache.org/viewvc?view=rev&revision=651308
> 
> I'm confident that most of this is acceptable. The changes on 4.2.x will
> be merged back
> 
> There is one set of diffs in string that have me a little concerned. You
> can see those below.
> 
> $ svn diff \
>   --old=http://svn.apache.org/repos/asf/stdcxx/trunk/include/string \
>  
> --new=http://svn.apache.org/repos/asf/stdcxx/branches/4.2.x/include/stri
> ng
[...]
> 
> The second issue is the _EXPORT keyword that was added to
> __rw_replace{_aux}() (in both string and string.cc) on trunk, but not on
> 4.2.x.

The missing export would definitely be a problem. I just merged
the diff along with rev 648509 to 4.2.x:
http://svn.apache.org/viewvc?view=rev&revision=648509

I'm not sure about the public/private difference. AFAICS, the
only change that looks like it might have introduced it is this
one: http://svn.apache.org/viewvc?view=rev&revision=544975 but
it is on the branch. Since nothing seems to be failing because
of it I'm not going to worry about it.

Thanks again!
Martin


Mime
View raw message