diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-08 00:25:35 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2014-10-08 00:25:35 +0000 |
| commit | 6e9c74cc000411ab379961fab1296be10a1c6c1e (patch) | |
| tree | 9b1af83dd4e1a267d6bfeaad335f2445df24f4c0 | |
| parent | cd1724ebe7dc01172acb8645583f218326012dca (diff) | |
| download | gcc-6e9c74cc000411ab379961fab1296be10a1c6c1e.tar.gz | |
* tree.c (cp_tree_equal) [TRAIT_EXPR]: Use cp_tree_equal for type2.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215991 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 10084c4903a..77a825e86f8 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2014-10-07 Jason Merrill <jason@redhat.com> + + * tree.c (cp_tree_equal) [TRAIT_EXPR]: Use cp_tree_equal for type2. + 2014-10-06 Edward Smith-Rowland <3dw4rd@verizon.net> * cp/parser.c: Allow [[deprecated]] for C++11. Issue a pedwarn. diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 316c8ff8d40..cfb0ed8c299 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -2891,7 +2891,7 @@ cp_tree_equal (tree t1, tree t2) if (TRAIT_EXPR_KIND (t1) != TRAIT_EXPR_KIND (t2)) return false; return same_type_p (TRAIT_EXPR_TYPE1 (t1), TRAIT_EXPR_TYPE1 (t2)) - && same_type_p (TRAIT_EXPR_TYPE2 (t1), TRAIT_EXPR_TYPE2 (t2)); + && cp_tree_equal (TRAIT_EXPR_TYPE2 (t1), TRAIT_EXPR_TYPE2 (t2)); case CAST_EXPR: case STATIC_CAST_EXPR: |