Mercurial > octave
changeset 25831:d0062829754a stable
Silence compiler warnings about unused functions from cset 8ac4bfa55053.
* pt-cbinop.cc (strip_not, simplify_and_or_op): Use #if 0 / #endif to comment
out unused functions.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 28 Aug 2018 16:41:07 -0700 |
| parents | 8ac4bfa55053 |
| children | 0631e6cc9a58 229b80676352 |
| files | libinterp/parse-tree/pt-cbinop.cc |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-cbinop.cc Tue Aug 28 13:32:53 2018 -0400 +++ b/libinterp/parse-tree/pt-cbinop.cc Tue Aug 28 16:41:07 2018 -0700 @@ -57,6 +57,10 @@ return octave_value::unknown_unary_op; } +#if 0 + // Restore this code if short-circuit behavior can be preserved when needed. + // See bug #54465. + static octave_value::unary_op strip_not (octave::tree_expression_ptr_t& exp) { @@ -77,6 +81,7 @@ else return octave_value::unknown_unary_op; } +#endif // Possibly convert multiplication to trans_mul, mul_trans, herm_mul, // or mul_herm. @@ -128,6 +133,9 @@ // Possibly contract and/or with negation. +#if 0 + // Restore this code if short-circuit behavior can be preserved when needed. + // See bug #54465. static octave_value::compound_binary_op simplify_and_or_op (octave::tree_expression_ptr_t& a, octave::tree_expression_ptr_t& b, @@ -160,6 +168,7 @@ return retop; } +#endif tree_binary_expression * maybe_compound_binary_expression (tree_expression *a, tree_expression *b, @@ -180,8 +189,8 @@ break; #if 0 - // Restore this case if short-circuit behavior can be preserved - // when needed. See bug #54465. + // Restore this case if short-circuit behavior can be preserved + // when needed. See bug #54465. case octave_value::op_el_and: case octave_value::op_el_or: ct = simplify_and_or_op (ca, cb, t);