Merge from trunk.
commit0175fa5dd7fc2f37dc6eaf1206d47a3d9f5ee0ac
authorasutton <asutton@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 13 Nov 2014 16:56:37 +0000 (13 16:56 +0000)
committerasutton <asutton@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 13 Nov 2014 16:56:37 +0000 (13 16:56 +0000)
tree2cd337b83190ac4f9e2f9bea2c4d839d3c2db50d
parent6dbc4c610ccece644e2a3a839d2df698aa4be522
parent20ba0684ac43d2f4ceaaf3de5cf66d94ed4dc4c6
Merge from trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/c++-concepts@217511 138bc75d-0d04-0410-961f-82ee72b054a4
26 files changed:
ChangeLog.concepts
gcc/c-family/c-common.c
gcc/c-family/c-common.h
gcc/c-family/c-format.c
gcc/c-family/c-opts.c
gcc/c-family/c.opt
gcc/cp/Make-lang.in
gcc/cp/call.c
gcc/cp/class.c
gcc/cp/constraint.cc
gcc/cp/cp-objcp-common.c
gcc/cp/cp-tree.def
gcc/cp/cp-tree.h
gcc/cp/cxx-pretty-print.c
gcc/cp/cxx-pretty-print.h
gcc/cp/decl.c
gcc/cp/decl2.c
gcc/cp/error.c
gcc/cp/logic.cc
gcc/cp/parser.c
gcc/cp/pt.c
gcc/cp/semantics.c
gcc/cp/tree.c
gcc/cp/typeck.c
gcc/doc/extend.texi
gcc/testsuite/lib/prune.exp