public inbox for gcc@gcc.gnu.org
 help / color / mirror / Atom feed
* [pph] Mainline merge @167963
@ 2010-12-17 14:45 Diego Novillo
  0 siblings, 0 replies; only message in thread
From: Diego Novillo @ 2010-12-17 14:45 UTC (permalink / raw)
  To: gcc, Lawrence Crowl

A couple of conflicts in the merge, but nothing too big.

Bootstrapped and tested on x86_64.


gcc/ChangeLog.pph
        Mainline merge r167963.

        * BASE-VER: Update revision stamp.

libcpp/ChangeLog.pph

        * internal.h (struct cpp_lookaside): Rename field
        flag_pth_debug to pth_debug_level.


gcc/cp/ChangeLog.pph

        * pph.c (pph_find_exposed_for, pph_get_decl_exposure):
        Replace uses of DECL_INTEGRAL_CONSTANT_VAR_P with
        decl_constant_var_p.


Diego.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-12-17 14:45 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-17 14:45 [pph] Mainline merge @167963 Diego Novillo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).