aboutsummaryrefslogtreecommitdiff
path: root/gcc/cp/pt.c
diff options
context:
space:
mode:
authorTorvald Riegel <triegel@redhat.com>2011-11-21 22:29:13 +0000
committerTorvald Riegel <torvald@gcc.gnu.org>2011-11-21 22:29:13 +0000
commit1e159409fcacfdfcb7046c3d870ee60d9e4131e8 (patch)
treeb1e5db9e9613722a5e7222a83a30547c2fd967cd /gcc/cp/pt.c
parentb0dc7e4c3470c0e40ea3b01962865ddb49c34d8c (diff)
downloadgcc-1e159409fcacfdfcb7046c3d870ee60d9e4131e8.zip
gcc-1e159409fcacfdfcb7046c3d870ee60d9e4131e8.tar.gz
gcc-1e159409fcacfdfcb7046c3d870ee60d9e4131e8.tar.bz2
Fix instantiation of transaction expressions.
gcc/cp/ * pt.c (tsubst_copy_and_build): Handle TRANSACTION_EXPR. gcc/testsuite/ * g++.dg/tm/template-2.C: New test. From-SVN: r181601
Diffstat (limited to 'gcc/cp/pt.c')
-rw-r--r--gcc/cp/pt.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 2ba26b2..f817b6f 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -14290,6 +14290,10 @@ tsubst_copy_and_build (tree t,
return r;
}
+ case TRANSACTION_EXPR:
+ return tsubst_expr(t, args, complain, in_decl,
+ integral_constant_expression_p);
+
default:
/* Handle Objective-C++ constructs, if appropriate. */
{