diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-07-08 21:32:06 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-07-08 21:32:06 +0000 |
| commit | f3250f7c20f0b26271ee87b2ebe4a339bc18a640 (patch) | |
| tree | f5c511a74bf9eb4fb56d339132634e6eae6b387a /gcc/cp/call.c | |
| parent | 3a3fc4a767e01feadf5f43e9b6ffc47d10b7dcbf (diff) | |
| download | gcc-f3250f7c20f0b26271ee87b2ebe4a339bc18a640.tar.gz | |
Rename lvalue_or_rvalue_with_address_p to glvalue_p.
* tree.c (glvalue_p): Rename from lvalue_or_rvalue_with_address_p.
* call.c, cp-tree.h, typeck.c: Adjust.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238181 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/call.c')
| -rw-r--r-- | gcc/cp/call.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 8b93c61a6db..850956647a6 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -4549,7 +4549,7 @@ conditional_conversion (tree e1, tree e2, tsubst_flags_t complain) If E2 is an xvalue: E1 can be converted to match E2 if E1 can be implicitly converted to the type "rvalue reference to T2", subject to the constraint that the reference must bind directly. */ - if (lvalue_or_rvalue_with_address_p (e2)) + if (glvalue_p (e2)) { tree rtype = cp_build_reference_type (t2, !real_lvalue_p (e2)); conv = implicit_conversion (rtype, @@ -4882,8 +4882,7 @@ build_conditional_expr_1 (location_t loc, tree arg1, tree arg2, tree arg3, && (CLASS_TYPE_P (arg2_type) || CLASS_TYPE_P (arg3_type) || (same_type_ignoring_top_level_qualifiers_p (arg2_type, arg3_type) - && lvalue_or_rvalue_with_address_p (arg2) - && lvalue_or_rvalue_with_address_p (arg3) + && glvalue_p (arg2) && glvalue_p (arg3) && real_lvalue_p (arg2) == real_lvalue_p (arg3)))) { conversion *conv2; |