Fix merge fallout.
authorrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 17 Nov 2013 10:11:15 +0000 (10:11 +0000)
committerrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 17 Nov 2013 10:11:15 +0000 (10:11 +0000)
commit652505ad84509a936ab14a0103bdcf18f12412c5
tree8b77657a81177ff0d6fce44c7dbbd35a3d7ca903
parent8370b483d36930e46d3ec5a083702386af597654
Fix merge fallout.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@204914 138bc75d-0d04-0410-961f-82ee72b054a4
gcc/c/c-parser.c
gcc/cp/parser.c
gcc/dwarf2out.c
gcc/tree-ssa-alias.c