I just merged the concepts branch with trunk, after fighting with the
testing framework for the past hour. There was a change to
gcc/testsuite/lib/prune.exp
yesterday that doesn't appear to be compatible with *something* in
this branch. It broke the entire test suite, giving the errors below
for
at revision 202396. No conflict.
-- Gaby
at revision 201992.
There were conflicts with the recent pretty printing patches.
Fixed. (Mostly due to the new concept-specific nodes printing.)
Modulo the asan stuff.
-- Gaby
The c++-concepts branch was synchronized with trunk at revision 201834.
-- Gaby
trunk was merged into c++-concepts branch at revision 201560.
I resolved some conflicts in cp caused by recent merges and ongoing work
on trunk.
-- Gaby
Tom Tromey writes:
| > "Gaby" == Gabriel Dos Reis writes:
|
| Gaby> We will have to watch out for Tom's Makefile rewrite work.
|
| FWIW, I've found rebasing this series to be very easy.
| Due to the way it is split up, only one patch (the big manual dependency
| removal one) only ever has
> "Gaby" == Gabriel Dos Reis writes:
Gaby> We will have to watch out for Tom's Makefile rewrite work.
FWIW, I've found rebasing this series to be very easy.
Due to the way it is split up, only one patch (the big manual dependency
removal one) only ever has "hard" conflicts, and that patch is
Andrew Sutton writes:
| Committed.
Merge from trunk as of revision 201285.
We will have to watch out for Tom's Makefile rewrite work.
-- Gaby
Trunk was merged to the c++-concept branch at revision 200958.
Andrew --
There aere a few conflicts surronding introduction of
can_convert_standard, between your version and the one Jason committed.
I resolved them in favour of Jason's because his version followed the
GNU coding convention (when
Andrew --
At revision 200343.
With the merge of Cilk changes to trunk, it was necessary to synchronize
so that c++-concepts branch doesn't get too out of sync. There were a
few conflicts in cp/Make-lang.in and cp/cp-tree.h that I think I
resolved properly. Let me know if anything else was los
At revision 200282.
Andrew --
there was a slight conflict with the new usage of is_binary_trait.
I think I resolved it properly, but double check.
-- Gaby
Trunk was merged into c++-concepts branch at revision 198984.
-- Gaby
Trunk was merged into the c++-concept branch as of revision 198506.
-- Gaby
Trunk as been merged into the c++-concepts branch.
-- Gaby
The trunk was merged into the c++-concepts branch as of revision 197225.
-- Gaby
I've merged changes from trunk into the c++-concepts branch as of
revision 196857. These include Jason's patch to stop randomness
in linkage name of entities defined at unnamed namespace scopes.
-- Gaby
16 matches
Mail list logo
